aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamYaple <sam@yaple.net>2016-01-05 18:15:18 +0000
committerSamYaple <sam@yaple.net>2016-01-06 14:44:13 +0000
commitbfcc849a407b012651ad07582b07a356d2317792 (patch)
treed0189c4e09053e73f67b40a60bdb904e94e34960
parente7c3677e5aba1ce7b1d69af2d6367fda98b3d21a (diff)
downloadkolla-bfcc849a407b012651ad07582b07a356d2317792.tar.gz
kolla-bfcc849a407b012651ad07582b07a356d2317792.zip
Allow rabbitmq role to pull images
Change-Id: I184aabfbbd9fcd0b87080d044b0d286f0deac14c Partially-Implements: blueprint pre-pull-images
-rw-r--r--ansible/roles/rabbitmq/tasks/deploy.yml6
-rw-r--r--ansible/roles/rabbitmq/tasks/main.yml6
-rw-r--r--ansible/roles/rabbitmq/tasks/pull.yml14
3 files changed, 21 insertions, 5 deletions
diff --git a/ansible/roles/rabbitmq/tasks/deploy.yml b/ansible/roles/rabbitmq/tasks/deploy.yml
new file mode 100644
index 000000000..98daa4021
--- /dev/null
+++ b/ansible/roles/rabbitmq/tasks/deploy.yml
@@ -0,0 +1,6 @@
+---
+- include: config.yml
+
+- include: bootstrap.yml
+
+- include: start.yml
diff --git a/ansible/roles/rabbitmq/tasks/main.yml b/ansible/roles/rabbitmq/tasks/main.yml
index 98daa4021..b017e8b4a 100644
--- a/ansible/roles/rabbitmq/tasks/main.yml
+++ b/ansible/roles/rabbitmq/tasks/main.yml
@@ -1,6 +1,2 @@
---
-- include: config.yml
-
-- include: bootstrap.yml
-
-- include: start.yml
+- include: "{{ action }}.yml"
diff --git a/ansible/roles/rabbitmq/tasks/pull.yml b/ansible/roles/rabbitmq/tasks/pull.yml
new file mode 100644
index 000000000..55520a10a
--- /dev/null
+++ b/ansible/roles/rabbitmq/tasks/pull.yml
@@ -0,0 +1,14 @@
+---
+- name: Pulling rabbitmq image
+ kolla_docker:
+ action: "pull_image"
+ common_options: "{{ docker_common_options }}"
+ image: "{{ rabbitmq_image_full }}"
+ when: inventory_hostname in groups['rabbitmq']
+
+- name: Pulling rabbitmq-data image
+ kolla_docker:
+ action: "pull_image"
+ common_options: "{{ docker_common_options }}"
+ image: "{{ rabbitmq_data_image_full }}"
+ when: inventory_hostname in groups['rabbitmq']