openstack
/
kolla-ansible
Code Issues Proposed changes

Merge "Revert "Omit outward_rabbitmq from check for upgrade""

This commit is contained in:
Zuul 2017-11-15 05:11:53 +00:00 committed by Gerrit Code Review
parent 826658e7d4 50be17292e
commit 0c915c908f
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
vars:
service_name: "rabbitmq"
@ -10,21 +9,17 @@
name: "{{ project_name }}"
image: "{{ rabbitmq_image_full }}"
environment: "{{ service.environment }}"
when:
- inventory_hostname in groups[role_rabbitmq_groups]
- project_name == "rabbitmq"
when: inventory_hostname in groups[role_rabbitmq_groups]
register: rabbitmq_differs
- include: config.yml
when: project_name == "rabbitmq"
- name: Find gospel node
command: docker exec -t {{ project_name }} /usr/local/bin/rabbitmq_get_gospel_node
changed_when: "(gospel_node.stdout | from_json).changed"
failed_when: "(gospel_node.stdout | from_json).failed"
changed_when: "{{ (gospel_node.stdout | from_json).changed }}"
failed_when: "{{ (gospel_node.stdout | from_json).failed }}"
register: gospel_node
run_once: True
when: project_name == "rabbitmq"
- name: Stopping non-gospel nodes
kolla_docker:
@ -32,20 +27,17 @@
common_options: "{{ docker_common_options }}"
name: "{{ project_name }}"
when:
- project_name == "rabbitmq"
- rabbitmq_hostname != (gospel_node.stdout | from_json).hostname
- rabbitmq_differs['result']
- name: Flush handlers
meta: flush_handlers
when:
- project_name == "rabbitmq"
- rabbitmq_hostname == (gospel_node.stdout | from_json).hostname
- rabbitmq_differs['result']
- name: Flush handlers
meta: flush_handlers
when:
- project_name == "rabbitmq"
- rabbitmq_hostname != (gospel_node.stdout | from_json).hostname
- rabbitmq_differs['result']