From 50be17292ef4e1315cf4f517c77d2edae5c919ce Mon Sep 17 00:00:00 2001
From: Eduardo Gonzalez <dabarren@gmail.com>
Date: Fri, 27 Oct 2017 05:43:43 +0000
Subject: [PATCH] Revert "Omit outward_rabbitmq from check for upgrade"
This reverts commit c618dbcd0efb20d5ece50d1b034eb0aba13bb31c.
Pike is already released
Change-Id: Id54a90e1c1d60f2be02ff4af3b648671d053c6a6
---
ansible/roles/rabbitmq/tasks/upgrade.yml | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/ansible/roles/rabbitmq/tasks/upgrade.yml b/ansible/roles/rabbitmq/tasks/upgrade.yml
index 7bea6381e8..f0cd9902d2 100644
--- a/ansible/roles/rabbitmq/tasks/upgrade.yml
+++ b/ansible/roles/rabbitmq/tasks/upgrade.yml
@@ -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']