openstack
/
kolla
Code Issues Proposed changes

Fix 'reconfigure' command of kolla 

Changed the order of the 'when' statements in "remove/restart
containers" tasks. It will fix the reconfiguration problem when
deploying different components on different hosts.

Change-Id: Ibee9dd56b6128b664144deb1d9eb7ec32e39fd5c
Closes-Bug: #1603943
This commit is contained in:
Bartłomiej Daca 2016-07-18 13:51:11 +02:00
parent 7a82901ada
commit e61f13d880
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/ceilometer/tasks/do_reconfigure.yml
View File

@ -50,9 +50,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: ceilometer_api, group: ceilometer-api },
{ name: ceilometer_central, group: ceilometer-central },
@ -70,10 +70,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: ceilometer_api, group: ceilometer-api },
{ name: ceilometer_central, group: ceilometer-central },

4
ansible/roles/glance/tasks/do_reconfigure.yml
View File

@ -35,9 +35,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:
- "{{ glance_service_groups }}"
- container_envs.results
@ -53,10 +53,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:
- "{{ glance_service_groups }}"
- container_envs.results

4
ansible/roles/heat/tasks/do_reconfigure.yml
View File

@ -44,9 +44,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: heat_api, group: heat-api },
{ name: heat_api_cfn, group: heat-api-cfn },
@ -62,10 +62,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: heat_api, group: heat-api },
{ name: heat_api_cfn, group: heat-api-cfn },

4
ansible/roles/ironic/tasks/do_reconfigure.yml
View File

@ -44,9 +44,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: ironic_pxe, group: ironic-pxe },
{ name: ironic_api, group: ironic-api },
@ -63,10 +63,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: ironic_pxe, group: ironic-pxe },
{ name: ironic_api, group: ironic-api },

4
ansible/roles/magnum/tasks/do_reconfigure.yml
View File

@ -41,9 +41,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: magnum_api, group: magnum-api },
{ name: magnum_conductor, group: magnum-conductor }]
@ -58,10 +58,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: magnum_api, group: magnum-api },
{ name: magnum_conductor, group: magnum-conductor }]

4
ansible/roles/manila/tasks/do_reconfigure.yml
View File

@ -44,9 +44,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: manila_api, group: manila-api },
{ name: manila_scheduler, group: manila-scheduler },
@ -62,10 +62,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: manila_api, group: manila-api },
{ name: manila_scheduler, group: manila-scheduler },

4
ansible/roles/mistral/tasks/do_reconfigure.yml
View File

@ -41,9 +41,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: mistral_api, group: mistral-api },
{ name: mistral_engine, group: mistral-engine },
@ -59,10 +59,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: mistral_api, group: mistral-api },
{ name: mistral_engine, group: mistral-engine },

4
ansible/roles/murano/tasks/do_reconfigure.yml
View File

@ -38,9 +38,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: murano_api, group: murano-api },
{ name: murano_engine, group: murano-engine }]
@ -55,10 +55,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: murano_api, group: murano-api },
{ name: murano_engine, group: murano-engine }]