aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamYaple <sam@yaple.net>2016-01-05 18:06:20 +0000
committerSamYaple <sam@yaple.net>2016-01-06 04:23:28 +0000
commite764e8522d0acdadda9c745a9f46b384b8aea368 (patch)
tree993a92f843e664ad9848cfc083e1aa3a568ee1e0
parentb6ac0b2eeffff51a093c8d6b3e1e1af1de672ced (diff)
downloadkolla-e764e8522d0acdadda9c745a9f46b384b8aea368.tar.gz
kolla-e764e8522d0acdadda9c745a9f46b384b8aea368.zip
Allow murano role to pull images
Change-Id: I0971ddcff7b688ae0dee7658ab4be7ca3fbbdc28 Partially-Implements: blueprint pre-pull-images
-rw-r--r--ansible/roles/murano/tasks/deploy.yml14
-rw-r--r--ansible/roles/murano/tasks/main.yml14
-rw-r--r--ansible/roles/murano/tasks/pull.yml14
3 files changed, 29 insertions, 13 deletions
diff --git a/ansible/roles/murano/tasks/deploy.yml b/ansible/roles/murano/tasks/deploy.yml
new file mode 100644
index 000000000..13d644732
--- /dev/null
+++ b/ansible/roles/murano/tasks/deploy.yml
@@ -0,0 +1,14 @@
+---
+- include: register.yml
+ when: inventory_hostname in groups['murano-api']
+
+- include: config.yml
+ when: inventory_hostname in groups['murano-api'] or
+ inventory_hostname in groups['murano-engine']
+
+- include: bootstrap.yml
+ when: inventory_hostname in groups['murano-api']
+
+- include: start.yml
+ when: inventory_hostname in groups['murano-api'] or
+ inventory_hostname in groups['murano-engine']
diff --git a/ansible/roles/murano/tasks/main.yml b/ansible/roles/murano/tasks/main.yml
index 13d644732..b017e8b4a 100644
--- a/ansible/roles/murano/tasks/main.yml
+++ b/ansible/roles/murano/tasks/main.yml
@@ -1,14 +1,2 @@
---
-- include: register.yml
- when: inventory_hostname in groups['murano-api']
-
-- include: config.yml
- when: inventory_hostname in groups['murano-api'] or
- inventory_hostname in groups['murano-engine']
-
-- include: bootstrap.yml
- when: inventory_hostname in groups['murano-api']
-
-- include: start.yml
- when: inventory_hostname in groups['murano-api'] or
- inventory_hostname in groups['murano-engine']
+- include: "{{ action }}.yml"
diff --git a/ansible/roles/murano/tasks/pull.yml b/ansible/roles/murano/tasks/pull.yml
new file mode 100644
index 000000000..5f979e56a
--- /dev/null
+++ b/ansible/roles/murano/tasks/pull.yml
@@ -0,0 +1,14 @@
+---
+- name: Pulling murano-api image
+ kolla_docker:
+ action: "pull_image"
+ common_options: "{{ docker_common_options }}"
+ image: "{{ murano_api_image_full }}"
+ when: inventory_hostname in groups['murano-api']
+
+- name: Pulling murano-engine image
+ kolla_docker:
+ action: "pull_image"
+ common_options: "{{ docker_common_options }}"
+ image: "{{ murano_engine_image_full }}"
+ when: inventory_hostname in groups['murano-engine']