aboutsummaryrefslogtreecommitdiff
path: root/ansible
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-19 08:23:35 +0000
committerGerrit Code Review <review@openstack.org>2016-09-19 08:23:36 +0000
commit42358d359b1e0c939f3f16cc0eb894b63e899d1f (patch)
treefdb8c2b63c5eacdd644381f518fee381e2296cb0 /ansible
parent0ae470447d01f4d3b4ee84c925401b41d4376f5c (diff)
parent897fb08bacf3ffd8d2f044c807a7524ff58e6aa6 (diff)
downloadkolla-42358d359b1e0c939f3f16cc0eb894b63e899d1f.tar.gz
kolla-42358d359b1e0c939f3f16cc0eb894b63e899d1f.zip
Merge "Fix reconfiguration issue for Keystone role"
Diffstat (limited to 'ansible')
-rw-r--r--ansible/roles/keystone/tasks/do_reconfigure.yml11
1 files changed, 6 insertions, 5 deletions
diff --git a/ansible/roles/keystone/tasks/do_reconfigure.yml b/ansible/roles/keystone/tasks/do_reconfigure.yml
index 2eb6fdba7..7cfeded61 100644
--- a/ansible/roles/keystone/tasks/do_reconfigure.yml
+++ b/ansible/roles/keystone/tasks/do_reconfigure.yml
@@ -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 }}"