aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladislav Belogrudov <vladislav.belogrudov@oracle.com>2015-08-10 15:02:08 +0300
committerVladislav Belogrudov <vladislav.belogrudov@oracle.com>2015-08-10 15:59:50 +0300
commitfe9092bab7ecfc58aa10ba4165c9bf21a99170e2 (patch)
treec690e8da6cab1317b1a88321ec272b295e9cf931
parent88b6f97cd05dceb817978f6bb44d528cd39d31a9 (diff)
downloadkolla-fe9092bab7ecfc58aa10ba4165c9bf21a99170e2.tar.gz
kolla-fe9092bab7ecfc58aa10ba4165c9bf21a99170e2.zip
Ansible should wait bootstrap container on first host
Bootstrapping of Keystone/Glance happens on first host via 'run_once'. After running bootstrap containers we should wait for them also on the same host. Currently waiting is done on all hosts what gives task error on other hosts. Change-Id: I6eac928d405ea819982118d9b567988074be4ed2 Closes-Bug: #1483224
-rw-r--r--ansible/roles/glance/tasks/bootstrap.yml1
-rw-r--r--ansible/roles/keystone/tasks/bootstrap.yml1
2 files changed, 2 insertions, 0 deletions
diff --git a/ansible/roles/glance/tasks/bootstrap.yml b/ansible/roles/glance/tasks/bootstrap.yml
index 3ccaacb03..374e3c7f1 100644
--- a/ansible/roles/glance/tasks/bootstrap.yml
+++ b/ansible/roles/glance/tasks/bootstrap.yml
@@ -69,6 +69,7 @@
# https://github.com/ansible/ansible-modules-core/pull/1031
- name: Waiting for bootstrap container to exit
command: docker wait bootstrap_glance
+ run_once: True
when: database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed
- name: Cleaning up Glance boostrap container
diff --git a/ansible/roles/keystone/tasks/bootstrap.yml b/ansible/roles/keystone/tasks/bootstrap.yml
index e6b179f48..91485a3cc 100644
--- a/ansible/roles/keystone/tasks/bootstrap.yml
+++ b/ansible/roles/keystone/tasks/bootstrap.yml
@@ -58,6 +58,7 @@
# https://github.com/ansible/ansible-modules-core/pull/1031
- name: Waiting for Keystone bootstrap container to exit
command: docker wait bootstrap_keystone
+ run_once: True
when: database.stdout.find('localhost | SUCCESS => ') != -1 and (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed
- name: Cleaning up Keystone boostrap container