From bfcc849a407b012651ad07582b07a356d2317792 Mon Sep 17 00:00:00 2001 From: SamYaple Date: Tue, 5 Jan 2016 18:15:18 +0000 Subject: [PATCH] Allow rabbitmq role to pull images Change-Id: I184aabfbbd9fcd0b87080d044b0d286f0deac14c Partially-Implements: blueprint pre-pull-images --- ansible/roles/rabbitmq/tasks/deploy.yml | 6 ++++++ ansible/roles/rabbitmq/tasks/main.yml | 6 +----- ansible/roles/rabbitmq/tasks/pull.yml | 14 ++++++++++++++ 3 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 ansible/roles/rabbitmq/tasks/deploy.yml create mode 100644 ansible/roles/rabbitmq/tasks/pull.yml diff --git a/ansible/roles/rabbitmq/tasks/deploy.yml b/ansible/roles/rabbitmq/tasks/deploy.yml new file mode 100644 index 0000000000..98daa4021c --- /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 98daa4021c..b017e8b4ad 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 0000000000..55520a10a3 --- /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']