diff options
| author | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-04-28 21:09:07 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-04-28 21:10:51 +0800 |
| commit | 1c85dc1858b16d9e891870ffd43bce52eee9ef49 (patch) | |
| tree | babbddd0570c1f21cb62f9a2adb333f90f9b0432 | |
| parent | 2705d67fa14a2e13ad0d13d1be37bfe1b9a89957 (diff) | |
| download | kolla-1c85dc1858b16d9e891870ffd43bce52eee9ef49.tar.gz kolla-1c85dc1858b16d9e891870ffd43bce52eee9ef49.zip | |
Re-order the when condition in the cinder reconfigure
Change-Id: Ib058a0d2bfd442cc80d67ec034b37298e881ae79
Closes-Bug: #1576209
| -rw-r--r-- | ansible/roles/cinder/tasks/do_reconfigure.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ansible/roles/cinder/tasks/do_reconfigure.yml b/ansible/roles/cinder/tasks/do_reconfigure.yml index bcede3850..91abc1525 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 }, |