From a40b4b7637675f96a99e29ac342668d41ce1ab5c Mon Sep 17 00:00:00 2001
From: Kaspars Skels <kaspars.skels@gmail.com>
Date: Fri, 26 Oct 2018 18:39:46 -0500
Subject: [PATCH] Use default replica count for mariadb/rabbitmq

This will default to 3 replicas and provide HA for mariadb/rabbitmq

Change-Id: Ifefa6d25ad3e69066bd799abb0d93391c8077c35
---
 global/software/charts/osh/openstack-cinder/rabbitmq.yaml      | 3 ---
 .../charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml     | 3 ---
 .../charts/osh/openstack-compute-kit/nova-rabbitmq.yaml        | 3 ---
 global/software/charts/osh/openstack-glance/rabbitmq.yaml      | 3 ---
 global/software/charts/osh/openstack-heat/rabbitmq.yaml        | 3 ---
 global/software/charts/osh/openstack-keystone/rabbitmq.yaml    | 3 ---
 global/software/charts/ucp/core/mariadb.yaml                   | 3 ---
 global/software/charts/ucp/core/rabbitmq.yaml                  | 3 ---
 8 files changed, 24 deletions(-)

diff --git a/global/software/charts/osh/openstack-cinder/rabbitmq.yaml b/global/software/charts/osh/openstack-cinder/rabbitmq.yaml
index 7475d62ef..cb78d2236 100644
--- a/global/software/charts/osh/openstack-cinder/rabbitmq.yaml
+++ b/global/software/charts/osh/openstack-cinder/rabbitmq.yaml
@@ -77,9 +77,6 @@ data:
           labels:
             release_group: airship-cinder-rabbitmq
   values:
-    pod:
-      replicas:
-        server: 1
     labels:
       server:
         node_selector_key: openstack-control-plane
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 195fa601f..d993e5547 100644
--- a/global/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml
+++ b/global/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml
@@ -77,9 +77,6 @@ data:
           labels:
             release_group: airship-neutron-rabbitmq
   values:
-    pod:
-      replicas:
-        server: 1
     labels:
       server:
         node_selector_key: openstack-control-plane
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 e40de63ac..639ed5402 100644
--- a/global/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml
+++ b/global/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml
@@ -77,9 +77,6 @@ data:
           labels:
             release_group: airship-nova-rabbitmq
   values:
-    pod:
-      replicas:
-        server: 1
     labels:
       server:
         node_selector_key: openstack-control-plane
diff --git a/global/software/charts/osh/openstack-glance/rabbitmq.yaml b/global/software/charts/osh/openstack-glance/rabbitmq.yaml
index 6d46e8169..a43184c0d 100644
--- a/global/software/charts/osh/openstack-glance/rabbitmq.yaml
+++ b/global/software/charts/osh/openstack-glance/rabbitmq.yaml
@@ -77,9 +77,6 @@ data:
           labels:
             release_group: airship-glance-rabbitmq
   values:
-    pod:
-      replicas:
-        server: 1
     labels:
       server:
         node_selector_key: openstack-control-plane
diff --git a/global/software/charts/osh/openstack-heat/rabbitmq.yaml b/global/software/charts/osh/openstack-heat/rabbitmq.yaml
index fe59eeb68..be92ad54c 100644
--- a/global/software/charts/osh/openstack-heat/rabbitmq.yaml
+++ b/global/software/charts/osh/openstack-heat/rabbitmq.yaml
@@ -77,9 +77,6 @@ data:
           labels:
             release_group: airship-heat-rabbitmq
   values:
-    pod:
-      replicas:
-        server: 1
     labels:
       server:
         node_selector_key: openstack-control-plane
diff --git a/global/software/charts/osh/openstack-keystone/rabbitmq.yaml b/global/software/charts/osh/openstack-keystone/rabbitmq.yaml
index 54c4d9b88..05e4801d6 100644
--- a/global/software/charts/osh/openstack-keystone/rabbitmq.yaml
+++ b/global/software/charts/osh/openstack-keystone/rabbitmq.yaml
@@ -77,9 +77,6 @@ data:
           labels:
             release_group: airship-keystone-rabbitmq
   values:
-    pod:
-      replicas:
-        server: 1
     labels:
       server:
         node_selector_key: openstack-control-plane
diff --git a/global/software/charts/ucp/core/mariadb.yaml b/global/software/charts/ucp/core/mariadb.yaml
index 4b8e5357b..f225c8dac 100644
--- a/global/software/charts/ucp/core/mariadb.yaml
+++ b/global/software/charts/ucp/core/mariadb.yaml
@@ -78,9 +78,6 @@ data:
       error_server:
         node_selector_key: ucp-control-plane
         node_selector_value: enabled
-    pod:
-      replicas:
-        server: 1
   dependencies:
     - mariadb-htk
 ...
diff --git a/global/software/charts/ucp/core/rabbitmq.yaml b/global/software/charts/ucp/core/rabbitmq.yaml
index 7c87724ce..0ad06c129 100644
--- a/global/software/charts/ucp/core/rabbitmq.yaml
+++ b/global/software/charts/ucp/core/rabbitmq.yaml
@@ -72,9 +72,6 @@ data:
           labels:
             release_group: airship-ucp-rabbitmq
   values:
-    pod:
-      replicas:
-        server: 1
     labels:
       server:
         node_selector_key: ucp-control-plane