From 29765a3e3efd72dacb5a610edc89338fb61a500b Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Thu, 11 Feb 2016 11:27:57 +0800 Subject: [PATCH] Do not pull rabbitmq-data image Rabbitmq container has moved to named volume. No need pull rabbitmq-data image. TrivialFix Change-Id: I83776ce626a7e398add0f07bd855924b8632b1ae --- ansible/roles/rabbitmq/defaults/main.yml | 4 ---- ansible/roles/rabbitmq/tasks/pull.yml | 7 ------- 2 files changed, 11 deletions(-) diff --git a/ansible/roles/rabbitmq/defaults/main.yml b/ansible/roles/rabbitmq/defaults/main.yml index 6cf3246bcf..b3ae1e9ca0 100644 --- a/ansible/roles/rabbitmq/defaults/main.yml +++ b/ansible/roles/rabbitmq/defaults/main.yml @@ -8,10 +8,6 @@ rabbitmq_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker rabbitmq_tag: "{{ openstack_release }}" 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 diff --git a/ansible/roles/rabbitmq/tasks/pull.yml b/ansible/roles/rabbitmq/tasks/pull.yml index 55520a10a3..cb289fabf5 100644 --- a/ansible/roles/rabbitmq/tasks/pull.yml +++ b/ansible/roles/rabbitmq/tasks/pull.yml @@ -5,10 +5,3 @@ 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']