From c618dbcd0efb20d5ece50d1b034eb0aba13bb31c Mon Sep 17 00:00:00 2001
From: Mick Thompson <michael.a.thompson@oracle.com>
Date: Wed, 12 Jul 2017 10:11:32 +0100
Subject: [PATCH] Omit outward_rabbitmq from check for upgrade

 Upgrade fails as outward_rabbitmq does not exist
 and cannot therefore be upgraded. Omit it from the
 upgrade check and bootstrap it after rabbitmq upgrade.

 Remove jinja2 from 'Find gospel node' task; removes warnings.

Change-Id: I3766271c62779c8dbd31e7cf2300473815bbbe68
---
 ansible/roles/rabbitmq/tasks/upgrade.yml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/ansible/roles/rabbitmq/tasks/upgrade.yml b/ansible/roles/rabbitmq/tasks/upgrade.yml
index f0cd9902d2..7bea6381e8 100644
--- a/ansible/roles/rabbitmq/tasks/upgrade.yml
+++ b/ansible/roles/rabbitmq/tasks/upgrade.yml
@@ -1,4 +1,5 @@
 ---
+# TODO(mickt): Revert Change I3766271c62779c8dbd31e7cf2300473815bbbe68 when Pike is released.
 - name: Checking if rabbitmq container needs upgrading
   vars:
     service_name: "rabbitmq"
@@ -9,17 +10,21 @@
     name: "{{ project_name }}"
     image: "{{ rabbitmq_image_full }}"
     environment: "{{ service.environment }}"
-  when: inventory_hostname in groups[role_rabbitmq_groups]
+  when:
+    - inventory_hostname in groups[role_rabbitmq_groups]
+    - project_name == "rabbitmq"
   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:
@@ -27,17 +32,20 @@
     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']