summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt McEuen <madgin@madgin.net>2019-02-28 14:56:13 -0600
committerMatt McEuen <madgin@madgin.net>2019-02-28 14:59:57 -0600
commit09f7130383fc353adf4df08403a7215ff4b722ca (patch)
tree67a878ba41502506ac07d6e818d15eac17dff0ef
parent48eb6ed0a455277e310f1a0b256ed38f548da952 (diff)
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
Notes
Notes (review): Code-Review+2: Kaspars Skels <kaspars.skels@gmail.com> Code-Review+1: Evgeniy L <eli@mirantis.com> Code-Review+2: Scott Hussey <sthussey@att.com> Workflow+1: Scott Hussey <sthussey@att.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 01 Mar 2019 17:20:53 +0000 Reviewed-on: https://review.openstack.org/640190 Project: openstack/airship-treasuremap Branch: refs/heads/master
-rw-r--r--global/software/charts/osh/openstack-cinder/rabbitmq.yaml2
-rw-r--r--global/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml2
-rw-r--r--global/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml2
-rw-r--r--global/software/charts/osh/openstack-glance/rabbitmq.yaml2
-rw-r--r--global/software/charts/osh/openstack-heat/rabbitmq.yaml2
-rw-r--r--global/software/charts/osh/openstack-keystone/rabbitmq.yaml2
-rw-r--r--global/software/charts/ucp/core/rabbitmq.yaml2
7 files changed, 14 insertions, 0 deletions
diff --git a/global/software/charts/osh/openstack-cinder/rabbitmq.yaml b/global/software/charts/osh/openstack-cinder/rabbitmq.yaml
index cb78d22..ab8fdfe 100644
--- a/global/software/charts/osh/openstack-cinder/rabbitmq.yaml
+++ b/global/software/charts/osh/openstack-cinder/rabbitmq.yaml
@@ -67,6 +67,8 @@ data:
67 timeout: 900 67 timeout: 900
68 labels: 68 labels:
69 release_group: airship-cinder-rabbitmq 69 release_group: airship-cinder-rabbitmq
70 resources:
71 - type: statefulset
70 install: 72 install:
71 no_hooks: false 73 no_hooks: false
72 upgrade: 74 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 e4e9ca0..b1b1525 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:
70 timeout: 900 70 timeout: 900
71 labels: 71 labels:
72 release_group: airship-neutron-rabbitmq 72 release_group: airship-neutron-rabbitmq
73 resources:
74 - type: statefulset
73 install: 75 install:
74 no_hooks: false 76 no_hooks: false
75 upgrade: 77 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 f536086..1d8ebac 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:
70 timeout: 900 70 timeout: 900
71 labels: 71 labels:
72 release_group: airship-nova-rabbitmq 72 release_group: airship-nova-rabbitmq
73 resources:
74 - type: statefulset
73 install: 75 install:
74 no_hooks: false 76 no_hooks: false
75 upgrade: 77 upgrade:
diff --git a/global/software/charts/osh/openstack-glance/rabbitmq.yaml b/global/software/charts/osh/openstack-glance/rabbitmq.yaml
index 2176de0..e69b9f3 100644
--- a/global/software/charts/osh/openstack-glance/rabbitmq.yaml
+++ b/global/software/charts/osh/openstack-glance/rabbitmq.yaml
@@ -70,6 +70,8 @@ data:
70 timeout: 900 70 timeout: 900
71 labels: 71 labels:
72 release_group: airship-glance-rabbitmq 72 release_group: airship-glance-rabbitmq
73 resources:
74 - type: statefulset
73 install: 75 install:
74 no_hooks: false 76 no_hooks: false
75 upgrade: 77 upgrade:
diff --git a/global/software/charts/osh/openstack-heat/rabbitmq.yaml b/global/software/charts/osh/openstack-heat/rabbitmq.yaml
index f1414f4..642cb87 100644
--- a/global/software/charts/osh/openstack-heat/rabbitmq.yaml
+++ b/global/software/charts/osh/openstack-heat/rabbitmq.yaml
@@ -70,6 +70,8 @@ data:
70 timeout: 900 70 timeout: 900
71 labels: 71 labels:
72 release_group: airship-heat-rabbitmq 72 release_group: airship-heat-rabbitmq
73 resources:
74 - type: statefulset
73 install: 75 install:
74 no_hooks: false 76 no_hooks: false
75 upgrade: 77 upgrade:
diff --git a/global/software/charts/osh/openstack-keystone/rabbitmq.yaml b/global/software/charts/osh/openstack-keystone/rabbitmq.yaml
index 18ed65b..263476b 100644
--- a/global/software/charts/osh/openstack-keystone/rabbitmq.yaml
+++ b/global/software/charts/osh/openstack-keystone/rabbitmq.yaml
@@ -70,6 +70,8 @@ data:
70 timeout: 900 70 timeout: 900
71 labels: 71 labels:
72 release_group: airship-keystone-rabbitmq 72 release_group: airship-keystone-rabbitmq
73 resources:
74 - type: statefulset
73 install: 75 install:
74 no_hooks: false 76 no_hooks: false
75 upgrade: 77 upgrade:
diff --git a/global/software/charts/ucp/core/rabbitmq.yaml b/global/software/charts/ucp/core/rabbitmq.yaml
index de4d564..f1b6601 100644
--- a/global/software/charts/ucp/core/rabbitmq.yaml
+++ b/global/software/charts/ucp/core/rabbitmq.yaml
@@ -64,6 +64,8 @@ data:
64 timeout: 300 64 timeout: 300
65 labels: 65 labels:
66 release_group: airship-ucp-rabbitmq 66 release_group: airship-ucp-rabbitmq
67 resources:
68 - type: statefulset
67 install: 69 install:
68 no_hooks: false 70 no_hooks: false
69 upgrade: 71 upgrade: