Merge "Fix reconfiguration issue for Keystone role"

This commit is contained in:
Jenkins 2016-09-19 08:23:35 +00:00 committed by Gerrit Code Review
commit 42358d359b

View File

@ -19,7 +19,7 @@
register: container_state
failed_when: container_state.Running == false
when: inventory_hostname in groups[item.group]
with_items: keystone_items
with_items: "{{ keystone_items }}"
- include: config.yml
@ -29,7 +29,7 @@
failed_when: false
register: check_results
when: inventory_hostname in groups[item.group]
with_items: keystone_items
with_items: "{{ keystone_items }}"
# NOTE(jeffrey4l): when config_strategy == 'COPY_ALWAYS'
# and container env['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE',
@ -40,7 +40,8 @@
action: "get_container_env"
register: container_envs
when: inventory_hostname in groups[item.group]
with_items: keystone_items
with_items: "{{ keystone_items }}"
- name: Remove the containers
kolla_docker:
@ -52,7 +53,7 @@
- item[2]['rc'] == 1
- inventory_hostname in groups[item[0]['group']]
with_together:
- [keystone_items]
- "{{ keystone_items }}"
- "{{ container_envs.results }}"
- "{{ check_results.results }}"
@ -69,6 +70,6 @@
- item[2]['rc'] == 1
- inventory_hostname in groups[item[0]['group']]
with_together:
- [keystone_items]
- "{{ keystone_items }}"
- "{{ container_envs.results }}"
- "{{ check_results.results }}"