From 09f7130383fc353adf4df08403a7215ff4b722ca Mon Sep 17 00:00:00 2001
From: Matt McEuen <madgin@madgin.net>
Date: Thu, 28 Feb 2019 14:56:13 -0600
Subject: [PATCH] Globals: Wait on RabbitMQ StatefulSets

This modifies the RabbitMQ Armada charts to wait specifically
for the RabbitMQ StatefulSets to complete prior to proceeding.
This is more robust than the default Pod waiting, as Pod waiting
for SS's has a race condition such that all Pods are likely
Running and Ready prior to any action having been taken, during
and upgrade scenario.

This change leverages recent Armada resource-based wait functionality.

Change-Id: I3867ce6966047d6b877a9bfa872defc0eda9693a
---
 global/software/charts/osh/openstack-cinder/rabbitmq.yaml       | 2 ++
 .../charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml      | 2 ++
 .../charts/osh/openstack-compute-kit/nova-rabbitmq.yaml         | 2 ++
 global/software/charts/osh/openstack-glance/rabbitmq.yaml       | 2 ++
 global/software/charts/osh/openstack-heat/rabbitmq.yaml         | 2 ++
 global/software/charts/osh/openstack-keystone/rabbitmq.yaml     | 2 ++
 global/software/charts/ucp/core/rabbitmq.yaml                   | 2 ++
 7 files changed, 14 insertions(+)

diff --git a/global/software/charts/osh/openstack-cinder/rabbitmq.yaml b/global/software/charts/osh/openstack-cinder/rabbitmq.yaml
index cb78d2236..ab8fdfe0c 100644
--- a/global/software/charts/osh/openstack-cinder/rabbitmq.yaml
+++ b/global/software/charts/osh/openstack-cinder/rabbitmq.yaml
@@ -67,6 +67,8 @@ data:
     timeout: 900
     labels:
       release_group: airship-cinder-rabbitmq
+    resources:
+      - type: statefulset
   install:
     no_hooks: false
   upgrade:
diff --git a/global/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml b/global/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml
index e4e9ca045..b1b1525ea 100644
--- a/global/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml
+++ b/global/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml
@@ -70,6 +70,8 @@ data:
     timeout: 900
     labels:
       release_group: airship-neutron-rabbitmq
+    resources:
+      - type: statefulset
   install:
     no_hooks: false
   upgrade:
diff --git a/global/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml b/global/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml
index f53608669..1d8ebac95 100644
--- a/global/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml
+++ b/global/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml
@@ -70,6 +70,8 @@ data:
     timeout: 900
     labels:
       release_group: airship-nova-rabbitmq
+    resources:
+      - type: statefulset
   install:
     no_hooks: false
   upgrade:
diff --git a/global/software/charts/osh/openstack-glance/rabbitmq.yaml b/global/software/charts/osh/openstack-glance/rabbitmq.yaml
index 2176de00c..e69b9f33a 100644
--- a/global/software/charts/osh/openstack-glance/rabbitmq.yaml
+++ b/global/software/charts/osh/openstack-glance/rabbitmq.yaml
@@ -70,6 +70,8 @@ data:
     timeout: 900
     labels:
       release_group: airship-glance-rabbitmq
+    resources:
+      - type: statefulset
   install:
     no_hooks: false
   upgrade:
diff --git a/global/software/charts/osh/openstack-heat/rabbitmq.yaml b/global/software/charts/osh/openstack-heat/rabbitmq.yaml
index f1414f4d6..642cb877e 100644
--- a/global/software/charts/osh/openstack-heat/rabbitmq.yaml
+++ b/global/software/charts/osh/openstack-heat/rabbitmq.yaml
@@ -70,6 +70,8 @@ data:
     timeout: 900
     labels:
       release_group: airship-heat-rabbitmq
+    resources:
+      - type: statefulset
   install:
     no_hooks: false
   upgrade:
diff --git a/global/software/charts/osh/openstack-keystone/rabbitmq.yaml b/global/software/charts/osh/openstack-keystone/rabbitmq.yaml
index 18ed65b81..263476b1e 100644
--- a/global/software/charts/osh/openstack-keystone/rabbitmq.yaml
+++ b/global/software/charts/osh/openstack-keystone/rabbitmq.yaml
@@ -70,6 +70,8 @@ data:
     timeout: 900
     labels:
       release_group: airship-keystone-rabbitmq
+    resources:
+      - type: statefulset
   install:
     no_hooks: false
   upgrade:
diff --git a/global/software/charts/ucp/core/rabbitmq.yaml b/global/software/charts/ucp/core/rabbitmq.yaml
index de4d564ef..f1b660162 100644
--- a/global/software/charts/ucp/core/rabbitmq.yaml
+++ b/global/software/charts/ucp/core/rabbitmq.yaml
@@ -64,6 +64,8 @@ data:
     timeout: 300
     labels:
       release_group: airship-ucp-rabbitmq
+    resources:
+      - type: statefulset
   install:
     no_hooks: false
   upgrade: