From 27621351aceefbf6693153be2a7fe870336ce3eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Daca?= Date: Mon, 19 Sep 2016 18:46:13 +0200 Subject: [PATCH] Repair swift reconfiguration Change the conditions order in when statement. TrivialFix Change-Id: Ied9907ff25b66de3fd43502a920a88af8ff0cacd Closes-Bug: #1625256 --- ansible/roles/swift/tasks/do_reconfigure.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/swift/tasks/do_reconfigure.yml b/ansible/roles/swift/tasks/do_reconfigure.yml index a7922d0792..3cb6ebe548 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 },