Merge "Fix Ceph and Swift precheck failure"

ansible/roles/ceph/tasks/precheck.yml

@@ -16,7 +16,7 @@
     - container_facts['ceph_rgw'] is not defined
     - inventory_hostname in groups['ceph-rgw']
 
-- name: Check whether the swift service is enabled
-  local_action: fail msg='Ceph-rgw-keystone is conflicts with swift, you should only enable one of them'
-  when: enable_swift | bool
+- name: Check whether the Swift service is enabled
+  local_action: fail msg='Ceph-rgw conflicts with Swift, and so you should only enable one of them'
+  when: enable_swift | bool and enable_ceph_rgw | bool
   run_once: True