diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-28 20:57:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-28 20:57:37 +0000 |
| commit | 4075a2382fdbde267788fd77966516eabe485da7 (patch) | |
| tree | 3a34cd5d5df23db6b8ebe9fe5186a582615311ad | |
| parent | cb51e8b1496fc9c6c8656e6b3931f19c50b1c628 (diff) | |
| parent | 1c85dc1858b16d9e891870ffd43bce52eee9ef49 (diff) | |
| download | kolla-4075a2382fdbde267788fd77966516eabe485da7.tar.gz kolla-4075a2382fdbde267788fd77966516eabe485da7.zip | |
Merge "Re-order the when condition in the cinder reconfigure"
| -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 }, |