From bdc9d2555eea4ac73ba92d91ef151b8687b842b9 Mon Sep 17 00:00:00 2001 From: caoyuan Date: Fri, 8 Dec 2017 00:24:47 +0800 Subject: [PATCH] Move swift service conflicted check into precheck.yml the precheck action should better move in precheck.yml Change-Id: I233cc73e7c16dd0d7f98338966d964417da7d0ad --- ansible/roles/ceph/tasks/precheck.yml | 5 +++++ ansible/roles/ceph/tasks/start_rgw_keystone.yml | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ansible/roles/ceph/tasks/precheck.yml b/ansible/roles/ceph/tasks/precheck.yml index 1b58cb09fb..cad059fbf1 100644 --- a/ansible/roles/ceph/tasks/precheck.yml +++ b/ansible/roles/ceph/tasks/precheck.yml @@ -15,3 +15,8 @@ when: - 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 + run_once: True diff --git a/ansible/roles/ceph/tasks/start_rgw_keystone.yml b/ansible/roles/ceph/tasks/start_rgw_keystone.yml index aac281a6f9..9a031c95fc 100644 --- a/ansible/roles/ceph/tasks/start_rgw_keystone.yml +++ b/ansible/roles/ceph/tasks/start_rgw_keystone.yml @@ -1,9 +1,4 @@ --- -- name: Check whether the swift service is enabled - local_action: fail msg='Ceph-rgw-keystone is conflicted with swift, you should only enable one of them' - when: enable_swift | bool - run_once: True - - name: Creating the Swift service and endpoint kolla_toolbox: module_name: kolla_keystone_service