openstack/kolla-ansible
Code Issues Proposed changes

Merge "Re-order the when condition in the cinder reconfigure"

Browse Source
This commit is contained in:
Jenkins 2016-04-28 20:57:36 +00:00 committed by Gerrit Code Review
commit 4075a2382f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/cinder/tasks/do_reconfigure.yml
View File

@ -47,9 +47,9 @@
action: "remove_container" action: "remove_container"
register: remove_containers register: remove_containers
when: when:
- inventory_hostname in groups[item[0]['group']]
- config_strategy == "COPY_ONCE" or item[1]['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE' - config_strategy == "COPY_ONCE" or item[1]['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE'
- item[2]['rc'] == 1 - item[2]['rc'] == 1
- inventory_hostname in groups[item[0]['group']]
with_together: with_together:
- [{ name: cinder_api, group: cinder-api }, - [{ name: cinder_api, group: cinder-api },
{ name: cinder_scheduler, group: cinder-scheduler }, { name: cinder_scheduler, group: cinder-scheduler },
@ -66,10 +66,10 @@
name: "{{ item[0]['name'] }}" name: "{{ item[0]['name'] }}"
action: "restart_container" action: "restart_container"
when: when:
- inventory_hostname in groups[item[0]['group']]
- config_strategy == 'COPY_ALWAYS' - config_strategy == 'COPY_ALWAYS'
- item[1]['KOLLA_CONFIG_STRATEGY'] != 'COPY_ONCE' - item[1]['KOLLA_CONFIG_STRATEGY'] != 'COPY_ONCE'
- item[2]['rc'] == 1 - item[2]['rc'] == 1
- inventory_hostname in groups[item[0]['group']]
with_together: with_together:
- [{ name: cinder_api, group: cinder-api }, - [{ name: cinder_api, group: cinder-api },
{ name: cinder_scheduler, group: cinder-scheduler }, { name: cinder_scheduler, group: cinder-scheduler },