diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-07 02:31:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-07 02:31:03 +0000 |
| commit | 8737b4c96e94c038eece9179c98aeada70925a3f (patch) | |
| tree | 36d01833b9e34b571b3333589f24805f101aceae | |
| parent | ecfc955a7ebf7b5ca630caf51b8d180f2e0af7e0 (diff) | |
| parent | bfcc849a407b012651ad07582b07a356d2317792 (diff) | |
| download | kolla-8737b4c96e94c038eece9179c98aeada70925a3f.tar.gz kolla-8737b4c96e94c038eece9179c98aeada70925a3f.zip | |
Merge "Allow rabbitmq role to pull images"
| -rw-r--r-- | ansible/roles/rabbitmq/tasks/deploy.yml | 6 | ||||
| -rw-r--r-- | ansible/roles/rabbitmq/tasks/main.yml | 6 | ||||
| -rw-r--r-- | ansible/roles/rabbitmq/tasks/pull.yml | 14 |
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'] |