diff options
| author | Bartłomiej Daca <bartek.daca@gmail.com> | 2016-09-19 18:46:13 +0200 |
|---|---|---|
| committer | Bartłomiej Daca <bartek.daca@gmail.com> | 2016-09-19 18:46:13 +0200 |
| commit | 27621351aceefbf6693153be2a7fe870336ce3eb (patch) | |
| tree | 4ff984ce83e01e7e8dfc86c17502214246148b70 | |
| parent | d694b576487b0cfc09fb6373d5e2b8a1fc2d10d6 (diff) | |
| download | kolla-27621351aceefbf6693153be2a7fe870336ce3eb.tar.gz kolla-27621351aceefbf6693153be2a7fe870336ce3eb.zip | |
Repair swift reconfiguration
Change the conditions order in when statement.
TrivialFix
Change-Id: Ied9907ff25b66de3fd43502a920a88af8ff0cacd
Closes-Bug: #1625256
| -rw-r--r-- | ansible/roles/swift/tasks/do_reconfigure.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ansible/roles/swift/tasks/do_reconfigure.yml b/ansible/roles/swift/tasks/do_reconfigure.yml index a7922d079..3cb6ebe54 100644 --- a/ansible/roles/swift/tasks/do_reconfigure.yml +++ b/ansible/roles/swift/tasks/do_reconfigure.yml @@ -86,9 +86,9 @@ action: "remove_container" register: remove_containers when: + - inventory_hostname in groups[item[0]['group']] - config_strategy == "COPY_ONCE" or item[1]['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE' - item[2]['rc'] == 1 - - inventory_hostname in groups[item[0]['group']] with_together: - [{ name: swift_account_server, group: swift-account-server }, { name: swift_account_auditor, group: swift-account-server }, @@ -118,10 +118,10 @@ name: "{{ item[0]['name'] }}" action: "restart_container" when: + - inventory_hostname in groups[item[0]['group']] - config_strategy == 'COPY_ALWAYS' - item[1]['KOLLA_CONFIG_STRATEGY'] != 'COPY_ONCE' - item[2]['rc'] == 1 - - inventory_hostname in groups[item[0]['group']] with_together: - [{ name: swift_account_server, group: swift-account-server }, { name: swift_account_auditor, group: swift-account-server }, |