aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamYaple <sam@yaple.net>2016-01-07 16:00:43 +0000
committerSamYaple <sam@yaple.net>2016-01-07 16:00:43 +0000
commit0995a40100c6cb2892aca78794414055ab4ec713 (patch)
treeb095c4be9bdda8028c1a89b1a43ac3d8458e02e6
parente5af3536b5c522ef8b57558ed00161ef123ef53c (diff)
downloadkolla-0995a40100c6cb2892aca78794414055ab4ec713.tar.gz
kolla-0995a40100c6cb2892aca78794414055ab4ec713.zip
Allow mistral role to pull images
Change-Id: Id5e56f62dff4fc7bc52641a56abab3ee88a25740 Partially-Implements: blueprint pre-pull-images
-rw-r--r--ansible/roles/mistral/tasks/deploy.yml16
-rw-r--r--ansible/roles/mistral/tasks/main.yml20
-rw-r--r--ansible/roles/mistral/tasks/pull.yml21
3 files changed, 43 insertions, 14 deletions
diff --git a/ansible/roles/mistral/tasks/deploy.yml b/ansible/roles/mistral/tasks/deploy.yml
new file mode 100644
index 000000000..5f062e5c5
--- /dev/null
+++ b/ansible/roles/mistral/tasks/deploy.yml
@@ -0,0 +1,16 @@
+---
+- include: register.yml
+ when: inventory_hostname in groups['mistral-api']
+
+- include: config.yml
+ when: inventory_hostname in groups['mistral-api'] or
+ inventory_hostname in groups['mistral-engine'] or
+ inventory_hostname in groups['mistral-executor']
+
+- include: bootstrap.yml
+ when: inventory_hostname in groups['mistral-api']
+
+- include: start.yml
+ when: inventory_hostname in groups['mistral-api'] or
+ inventory_hostname in groups['mistral-engine'] or
+ inventory_hostname in groups['mistral-executor']
diff --git a/ansible/roles/mistral/tasks/main.yml b/ansible/roles/mistral/tasks/main.yml
index 5f062e5c5..e261f83ee 100644
--- a/ansible/roles/mistral/tasks/main.yml
+++ b/ansible/roles/mistral/tasks/main.yml
@@ -1,16 +1,8 @@
---
-- include: register.yml
- when: inventory_hostname in groups['mistral-api']
+- include: "{{ action }}.yml"
+ when: not common_run
-- include: config.yml
- when: inventory_hostname in groups['mistral-api'] or
- inventory_hostname in groups['mistral-engine'] or
- inventory_hostname in groups['mistral-executor']
-
-- include: bootstrap.yml
- when: inventory_hostname in groups['mistral-api']
-
-- include: start.yml
- when: inventory_hostname in groups['mistral-api'] or
- inventory_hostname in groups['mistral-engine'] or
- inventory_hostname in groups['mistral-executor']
+- name: Registering common role has run
+ set_fact:
+ common_run: True
+ when: not common_run
diff --git a/ansible/roles/mistral/tasks/pull.yml b/ansible/roles/mistral/tasks/pull.yml
new file mode 100644
index 000000000..f8782d9f0
--- /dev/null
+++ b/ansible/roles/mistral/tasks/pull.yml
@@ -0,0 +1,21 @@
+---
+- name: Pulling mistral-api image
+ kolla_docker:
+ action: "pull_image"
+ common_options: "{{ docker_common_options }}"
+ image: "{{ mistral_api_image_full }}"
+ when: inventory_hostname in groups['mistral-api']
+
+- name: Pulling mistral-engine image
+ kolla_docker:
+ action: "pull_image"
+ common_options: "{{ docker_common_options }}"
+ image: "{{ mistral_engine_image_full }}"
+ when: inventory_hostname in groups['mistral-engine']
+
+- name: Pulling mistral-executor image
+ kolla_docker:
+ action: "pull_image"
+ common_options: "{{ docker_common_options }}"
+ image: "{{ mistral_executorngine_image_full }}"
+ when: inventory_hostname in groups['mistral-executor']