From 1c85dc1858b16d9e891870ffd43bce52eee9ef49 Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Thu, 28 Apr 2016 21:09:07 +0800 Subject: [PATCH] Re-order the when condition in the cinder reconfigure Change-Id: Ib058a0d2bfd442cc80d67ec034b37298e881ae79 Closes-Bug: #1576209 --- ansible/roles/cinder/tasks/do_reconfigure.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/cinder/tasks/do_reconfigure.yml b/ansible/roles/cinder/tasks/do_reconfigure.yml index bcede38508..91abc1525a 100644 --- a/ansible/roles/cinder/tasks/do_reconfigure.yml +++ b/ansible/roles/cinder/tasks/do_reconfigure.yml @@ -47,9 +47,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: cinder_api, group: cinder-api }, { name: cinder_scheduler, group: cinder-scheduler }, @@ -66,10 +66,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: cinder_api, group: cinder-api }, { name: cinder_scheduler, group: cinder-scheduler },