openstack/kolla-ansible
Code Issues Proposed changes

Merge "Move swift service conflicted check into precheck.yml"

Browse Source
This commit is contained in:
Zuul 2018-01-21 17:57:35 +00:00 committed by Gerrit Code Review
commit 574c68b375
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ansible/roles/ceph/tasks/precheck.yml
View File

@ -15,3 +15,8 @@
when: when:
- container_facts['ceph_rgw'] is not defined - container_facts['ceph_rgw'] is not defined
- inventory_hostname in groups['ceph-rgw'] - 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

5
ansible/roles/ceph/tasks/start_rgw_keystone.yml
View File

@ -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 - name: Creating the Swift service and endpoint
kolla_toolbox: kolla_toolbox:
module_name: kolla_keystone_service module_name: kolla_keystone_service