diff options
| author | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-02-11 11:27:57 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-02-12 08:39:25 +0800 |
| commit | 29765a3e3efd72dacb5a610edc89338fb61a500b (patch) | |
| tree | f7334eaca3af106f19ea2c3e9e98f137976c4e0a | |
| parent | a692718c00e0aeb431a7ea932f9a33ffbede0eae (diff) | |
| download | kolla-29765a3e3efd72dacb5a610edc89338fb61a500b.tar.gz kolla-29765a3e3efd72dacb5a610edc89338fb61a500b.zip | |
Do not pull rabbitmq-data image
Rabbitmq container has moved to named volume. No need pull rabbitmq-data
image.
TrivialFix
Change-Id: I83776ce626a7e398add0f07bd855924b8632b1ae
| -rw-r--r-- | ansible/roles/rabbitmq/defaults/main.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/rabbitmq/tasks/pull.yml | 7 |
2 files changed, 0 insertions, 11 deletions
diff --git a/ansible/roles/rabbitmq/defaults/main.yml b/ansible/roles/rabbitmq/defaults/main.yml index 6cf3246bc..b3ae1e9ca 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 55520a10a..cb289fabf 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'] |