From 2f89afa3849845317ac2ce6329aa78821a183fd1 Mon Sep 17 00:00:00 2001
From: Steve Wilkerson <sw5822@att.com>
Date: Tue, 27 Aug 2019 10:04:39 -0500
Subject: [PATCH] Add rabbitmq statefulset name to Armada chart overrides

This adds the rabbitmq statefulset name override to the values
for each openstack service chart in the Armada manifest, as this
is required to support communicating with the rabbitmq backends
directly

Change-Id: I4a2fabf491c6607bec80f37a8d1236c55ec8430a
Signed-off-by: Steve Wilkerson <sw5822@att.com>
---
 .../armada/manifests/armada-osh.yaml           | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tools/deployment/armada/manifests/armada-osh.yaml b/tools/deployment/armada/manifests/armada-osh.yaml
index ebb6f1ab47..6c86256a46 100644
--- a/tools/deployment/armada/manifests/armada-osh.yaml
+++ b/tools/deployment/armada/manifests/armada-osh.yaml
@@ -337,6 +337,9 @@ data:
           keystone:
             username: keystone-rabbitmq-user
             password: ${KEYSTONE_RABBITMQ_USER_PASSWORD}
+        statefulset:
+          replicas: 2
+          name: osh-rabbitmq-rabbitmq
     labels:
       api:
         node_selector_key: openstack-control-plane
@@ -483,6 +486,9 @@ data:
           glance:
             username: glance-rabbitmq-user
             password: ${GLANCE_RABBITMQ_USER_PASSWORD}
+        statefulset:
+          replicas: 2
+          name: osh-rabbitmq-rabbitmq
     labels:
       api:
         node_selector_key: openstack-control-plane
@@ -571,6 +577,9 @@ data:
           cinder:
             username: cinder-rabbitmq-user
             password: ${CINDER_RABBITMQ_USER_PASSWORD}
+        statefulset:
+          replicas: 2
+          name: osh-rabbitmq-rabbitmq
     labels:
       api:
         node_selector_key: openstack-control-plane
@@ -788,6 +797,9 @@ data:
           nova:
             username: nova-rabbitmq-user
             password: ${NOVA_RABBITMQ_USER_PASSWORD}
+        statefulset:
+          replicas: 2
+          name: osh-rabbitmq-rabbitmq
     labels:
       agent:
         compute:
@@ -927,6 +939,9 @@ data:
           neutron:
             username: neutron-rabbitmq-user
             password: ${NEUTRON_RABBITMQ_USER_PASSWORD}
+        statefulset:
+          replicas: 2
+          name: osh-rabbitmq-rabbitmq
     pod:
       replicas:
         server: 2
@@ -1055,6 +1070,9 @@ data:
           heat:
             username: heat-rabbitmq-user
             password: ${HEAT_RABBITMQ_USER_PASSWORD}
+        statefulset:
+          replicas: 2
+          name: osh-rabbitmq-rabbitmq
     labels:
       api:
         node_selector_key: openstack-control-plane