openstack/kolla-ansible
Code Issues Proposed changes

Do not pull rabbitmq-data image

Browse Source 
Rabbitmq container has moved to named volume. No need pull rabbitmq-data
image.

TrivialFix

Change-Id: I83776ce626a7e398add0f07bd855924b8632b1ae
This commit is contained in:
Jeffrey Zhang 2016-02-11 11:27:57 +08:00
parent a692718c00
commit 29765a3e3e
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/rabbitmq/defaults/main.yml
View File

@ -8,10 +8,6 @@ rabbitmq_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker
rabbitmq_tag: "{{ openstack_release }}" rabbitmq_tag: "{{ openstack_release }}"
rabbitmq_image_full: "{{ rabbitmq_image }}:{{ rabbitmq_tag }}" rabbitmq_image_full: "{{ rabbitmq_image }}:{{ rabbitmq_tag }}"
rabbitmq_data_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-data"
rabbitmq_data_tag: "{{ openstack_release }}"
rabbitmq_data_image_full: "{{ rabbitmq_data_image }}:{{ rabbitmq_data_tag }}"
#################### ####################
# Message-Broker # Message-Broker

7
ansible/roles/rabbitmq/tasks/pull.yml
View File

@ -5,10 +5,3 @@
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
image: "{{ rabbitmq_image_full }}" image: "{{ rabbitmq_image_full }}"
when: inventory_hostname in groups['rabbitmq'] 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']