From 3ff5ca140807e19765168d465ac31f228d6bde09 Mon Sep 17 00:00:00 2001 From: "Tone.Zhang" Date: Tue, 6 Feb 2018 16:20:47 +0800 Subject: [PATCH] Fix Ceph and Swift precheck failure If enable Ceph MDS and RBD services, they are not conflicting with Swift service. Fix the check condition to make sure both Ceph and Swift exist. Closes-Bug: #1747592 Change-Id: Icc6806125ce72992f7dff00c30d591ffb737a0c6 Signed-off-by: Tone.Zhang --- ansible/roles/ceph/tasks/precheck.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/roles/ceph/tasks/precheck.yml b/ansible/roles/ceph/tasks/precheck.yml index cad059fbf1..fabae009a4 100644 --- a/ansible/roles/ceph/tasks/precheck.yml +++ b/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