openstack/kolla-ansible
Code Issues Proposed changes

Revert "Omit outward_rabbitmq from check for upgrade"

Browse Source 
This reverts commit c618dbcd0e.

Pike is already released

Change-Id: Id54a90e1c1d60f2be02ff4af3b648671d053c6a6
This commit is contained in:
Eduardo Gonzalez 2017-10-27 05:43:43 +00:00
parent c618dbcd0e
commit 50be17292e
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ansible/roles/rabbitmq/tasks/upgrade.yml
View File

@ -1,5 +1,4 @@
--- ---
# TODO(mickt): Revert Change I3766271c62779c8dbd31e7cf2300473815bbbe68 when Pike is released.
- name: Checking if rabbitmq container needs upgrading - name: Checking if rabbitmq container needs upgrading
vars: vars:
service_name: "rabbitmq" service_name: "rabbitmq"
@ -10,21 +9,17 @@
name: "{{ project_name }}" name: "{{ project_name }}"
image: "{{ rabbitmq_image_full }}" image: "{{ rabbitmq_image_full }}"
environment: "{{ service.environment }}" environment: "{{ service.environment }}"
when: when: inventory_hostname in groups[role_rabbitmq_groups]
- inventory_hostname in groups[role_rabbitmq_groups]
- project_name == "rabbitmq"
register: rabbitmq_differs register: rabbitmq_differs
- include: config.yml - include: config.yml
when: project_name == "rabbitmq"
- name: Find gospel node - name: Find gospel node
command: docker exec -t {{ project_name }} /usr/local/bin/rabbitmq_get_gospel_node command: docker exec -t {{ project_name }} /usr/local/bin/rabbitmq_get_gospel_node
changed_when: "(gospel_node.stdout | from_json).changed" changed_when: "{{ (gospel_node.stdout | from_json).changed }}"
failed_when: "(gospel_node.stdout | from_json).failed" failed_when: "{{ (gospel_node.stdout | from_json).failed }}"
register: gospel_node register: gospel_node
run_once: True run_once: True
when: project_name == "rabbitmq"
- name: Stopping non-gospel nodes - name: Stopping non-gospel nodes
kolla_docker: kolla_docker:
@ -32,20 +27,17 @@
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
name: "{{ project_name }}" name: "{{ project_name }}"
when: when:
- project_name == "rabbitmq"
- rabbitmq_hostname != (gospel_node.stdout | from_json).hostname - rabbitmq_hostname != (gospel_node.stdout | from_json).hostname
- rabbitmq_differs['result'] - rabbitmq_differs['result']
- name: Flush handlers - name: Flush handlers
meta: flush_handlers meta: flush_handlers
when: when:
- project_name == "rabbitmq"
- rabbitmq_hostname == (gospel_node.stdout | from_json).hostname - rabbitmq_hostname == (gospel_node.stdout | from_json).hostname
- rabbitmq_differs['result'] - rabbitmq_differs['result']
- name: Flush handlers - name: Flush handlers
meta: flush_handlers meta: flush_handlers
when: when:
- project_name == "rabbitmq"
- rabbitmq_hostname != (gospel_node.stdout | from_json).hostname - rabbitmq_hostname != (gospel_node.stdout | from_json).hostname
- rabbitmq_differs['result'] - rabbitmq_differs['result']