diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-20 09:47:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-20 09:47:37 +0000 |
| commit | b74c8d19d4a2993ad405b9678b487ab86265b734 (patch) | |
| tree | 70bbeb2aef997e8022f50e498992104ac032eb20 /ansible | |
| parent | af9ea973e81b3376ae7e434e7724b2957786783b (diff) | |
| parent | 27621351aceefbf6693153be2a7fe870336ce3eb (diff) | |
| download | kolla-b74c8d19d4a2993ad405b9678b487ab86265b734.tar.gz kolla-b74c8d19d4a2993ad405b9678b487ab86265b734.zip | |
Merge "Repair swift reconfiguration"
Diffstat (limited to 'ansible')
| -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 }, |