openstack/kolla-ansible
Code Issues Proposed changes

Repair swift reconfiguration

Browse Source 
Change the conditions order in when statement.

TrivialFix

Change-Id: Ied9907ff25b66de3fd43502a920a88af8ff0cacd
Closes-Bug: #1625256
This commit is contained in:
Bartłomiej Daca 2016-09-19 18:46:13 +02:00
parent d694b57648
commit 27621351ac
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/swift/tasks/do_reconfigure.yml
View File

@ -86,9 +86,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: swift_account_server, group: swift-account-server }, - [{ name: swift_account_server, group: swift-account-server },
{ name: swift_account_auditor, group: swift-account-server }, { name: swift_account_auditor, group: swift-account-server },
@ -118,10 +118,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: swift_account_server, group: swift-account-server }, - [{ name: swift_account_server, group: swift-account-server },
{ name: swift_account_auditor, group: swift-account-server }, { name: swift_account_auditor, group: swift-account-server },