diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-12 14:08:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-12 14:08:19 +0000 |
| commit | e92b18a8a8c0d7dd3d05ac2b48e469b5b4773215 (patch) | |
| tree | 35e566359a4fcc85033d539bd07bbaaa4c0b1f5d | |
| parent | 013d21119f5cd2283c21e0b5d1d668fb2f44dbd3 (diff) | |
| parent | 29765a3e3efd72dacb5a610edc89338fb61a500b (diff) | |
| download | kolla-e92b18a8a8c0d7dd3d05ac2b48e469b5b4773215.tar.gz kolla-e92b18a8a8c0d7dd3d05ac2b48e469b5b4773215.zip | |
Merge "Do not pull rabbitmq-data image"
| -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'] |