From 217b279a0a1a635bf281a6ee54664f42b9d41b94 Mon Sep 17 00:00:00 2001
From: Chris Friesen <chris.friesen@windriver.com>
Date: Wed, 6 Feb 2019 13:40:06 -0600
Subject: [PATCH] clean up duplicated code in sysinv/helm

There are some bits of code that are duplicated across almost
all the sysinv helm classes, and so it makes sense to pull
them into the parent class.

Change-Id: I3979a8e0052f751a41b1461826d492961d2bfdae
Signed-off-by: Chris Friesen <chris.friesen@windriver.com>
Story: 2003909
Task: 29412
---
 sysinv/sysinv/sysinv/sysinv/helm/aodh.py      |  6 ------
 sysinv/sysinv/sysinv/sysinv/helm/barbican.py  |  6 ------
 sysinv/sysinv/sysinv/sysinv/helm/base.py      | 21 +++++++++++++++++++
 .../sysinv/sysinv/sysinv/helm/ceilometer.py   |  6 ------
 sysinv/sysinv/sysinv/sysinv/helm/cinder.py    |  6 ------
 sysinv/sysinv/sysinv/sysinv/helm/garbd.py     |  8 ++-----
 sysinv/sysinv/sysinv/sysinv/helm/glance.py    |  6 ------
 sysinv/sysinv/sysinv/sysinv/helm/gnocchi.py   |  6 ------
 sysinv/sysinv/sysinv/sysinv/helm/heat.py      |  6 ------
 sysinv/sysinv/sysinv/sysinv/helm/horizon.py   |  6 ------
 sysinv/sysinv/sysinv/sysinv/helm/ingress.py   |  6 ++----
 sysinv/sysinv/sysinv/sysinv/helm/ironic.py    |  6 ------
 sysinv/sysinv/sysinv/sysinv/helm/keystone.py  |  6 ------
 sysinv/sysinv/sysinv/sysinv/helm/libvirt.py   |  6 ------
 sysinv/sysinv/sysinv/sysinv/helm/magnum.py    |  6 ------
 sysinv/sysinv/sysinv/sysinv/helm/mariadb.py   |  6 ------
 sysinv/sysinv/sysinv/sysinv/helm/memcached.py |  8 ++-----
 sysinv/sysinv/sysinv/sysinv/helm/neutron.py   |  6 ------
 sysinv/sysinv/sysinv/sysinv/helm/nova.py      |  6 ------
 .../sysinv/sysinv/helm/nova_api_proxy.py      |  6 ------
 sysinv/sysinv/sysinv/sysinv/helm/openstack.py |  3 +++
 .../sysinv/sysinv/sysinv/helm/openvswitch.py  |  6 ------
 sysinv/sysinv/sysinv/sysinv/helm/panko.py     |  6 ------
 sysinv/sysinv/sysinv/sysinv/helm/rabbitmq.py  |  6 ------
 .../sysinv/sysinv/helm/rbd_provisioner.py     |  8 ++-----
 25 files changed, 32 insertions(+), 136 deletions(-)

diff --git a/sysinv/sysinv/sysinv/sysinv/helm/aodh.py b/sysinv/sysinv/sysinv/sysinv/helm/aodh.py
index 55f56fa023..f726de5ab0 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/aodh.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/aodh.py
@@ -17,16 +17,10 @@ class AodhHelm(openstack.OpenstackBaseHelm):
     """Class to encapsulate helm operations for the aodh chart"""
 
     CHART = constants.HELM_CHART_AODH
-    SUPPORTED_NAMESPACES = [
-        common.HELM_NS_OPENSTACK
-    ]
 
     SERVICE_NAME = 'aodh'
     AUTH_USERS = ['aodh']
 
-    def get_namespaces(self):
-        return self.SUPPORTED_NAMESPACES
-
     def get_overrides(self, namespace=None):
         overrides = {
             common.HELM_NS_OPENSTACK: {
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/barbican.py b/sysinv/sysinv/sysinv/sysinv/helm/barbican.py
index 9f04018779..f43d683b1d 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/barbican.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/barbican.py
@@ -14,15 +14,9 @@ class BarbicanHelm(openstack.OpenstackBaseHelm):
     """Class to encapsulate helm operations for the barbican chart"""
 
     CHART = constants.HELM_CHART_BARBICAN
-    SUPPORTED_NAMESPACES = [
-        common.HELM_NS_OPENSTACK
-    ]
 
     SERVICE_NAME = constants.HELM_CHART_BARBICAN
 
-    def get_namespaces(self):
-        return self.SUPPORTED_NAMESPACES
-
     def get_overrides(self, namespace=None):
         overrides = {
             common.HELM_NS_OPENSTACK: {
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/base.py b/sysinv/sysinv/sysinv/sysinv/helm/base.py
index b9b08c1b02..a0a36da184 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/base.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/base.py
@@ -27,6 +27,7 @@ class BaseHelm(object):
 
     DEFAULT_REGION_NAME = 'RegionOne'
     CEPH_MON_SERVICE_PORT = 6789
+    SUPPORTED_NAMESPACES = []
 
     def __init__(self, operator):
         self._operator = operator
@@ -194,6 +195,26 @@ class BaseHelm(object):
             constants.CONTROLLER_0_HOSTNAME, constants.NETWORK_TYPE_MGMT)
         return address.address
 
+    def get_namespaces(self):
+        """
+        Return list of namespaces supported by this chart
+
+        If a chart supports namespaces other than common.HELM_NS_OPENSTACK
+        then it can override self.SUPPORTED_NAMESPACES as desired.
+        """
+        return self.SUPPORTED_NAMESPACES
+
+    def get_overrides(self, namespace=None):
+        """
+        Return chart-specific values overrides
+
+        This allows a helm chart class to specify overrides (in Helm format)
+        for the "values" section of a helm chart.
+
+        May be left blank to indicate that there are no additional overrides.
+        """
+        return {}
+
     def get_meta_overrides(self, namespace):
         """
         Return Armada-formatted chart-specific meta-overrides
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/ceilometer.py b/sysinv/sysinv/sysinv/sysinv/helm/ceilometer.py
index 04f8c70671..e1defe82dc 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/ceilometer.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/ceilometer.py
@@ -18,16 +18,10 @@ class CeilometerHelm(openstack.OpenstackBaseHelm):
     """Class to encapsulate helm operations for the ceilometer chart"""
 
     CHART = constants.HELM_CHART_CEILOMETER
-    SUPPORTED_NAMESPACES = [
-        common.HELM_NS_OPENSTACK
-    ]
 
     SERVICE_NAME = 'ceilometer'
     AUTH_USERS = ['ceilometer']
 
-    def get_namespaces(self):
-        return self.SUPPORTED_NAMESPACES
-
     def get_overrides(self, namespace=None):
         overrides = {
             common.HELM_NS_OPENSTACK: {
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/cinder.py b/sysinv/sysinv/sysinv/sysinv/helm/cinder.py
index 743f8f6bed..1c9d8bb445 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/cinder.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/cinder.py
@@ -19,17 +19,11 @@ class CinderHelm(openstack.OpenstackBaseHelm):
     """Class to encapsulate helm operations for the cinder chart"""
 
     CHART = constants.HELM_CHART_CINDER
-    SUPPORTED_NAMESPACES = [
-        common.HELM_NS_OPENSTACK
-    ]
 
     SERVICE_NAME = 'cinder'
     SERVICE_TYPE = 'volume'
     AUTH_USERS = ['cinder']
 
-    def get_namespaces(self):
-        return self.SUPPORTED_NAMESPACES
-
     def get_overrides(self, namespace=None):
         overrides = {
             common.HELM_NS_OPENSTACK: {
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/garbd.py b/sysinv/sysinv/sysinv/sysinv/helm/garbd.py
index 2bf19b440d..fdb4501c6a 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/garbd.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/garbd.py
@@ -23,12 +23,8 @@ class GarbdHelm(base.BaseHelm):
     SERVICE_NAME = 'mariadb'
 
     CHART = constants.HELM_CHART_GARBD
-    SUPPORTED_NAMESPACES = [
-        common.HELM_NS_OPENSTACK
-    ]
-
-    def get_namespaces(self):
-        return self.SUPPORTED_NAMESPACES
+    SUPPORTED_NAMESPACES = \
+        base.BaseHelm.SUPPORTED_NAMESPACES + [common.HELM_NS_OPENSTACK]
 
     def get_meta_overrides(self, namespace):
 
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/glance.py b/sysinv/sysinv/sysinv/sysinv/helm/glance.py
index 89d426c5ef..737d8e63b7 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/glance.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/glance.py
@@ -23,17 +23,11 @@ class GlanceHelm(openstack.OpenstackBaseHelm):
     """Class to encapsulate helm operations for the glance chart"""
 
     CHART = constants.HELM_CHART_GLANCE
-    SUPPORTED_NAMESPACES = [
-        common.HELM_NS_OPENSTACK
-    ]
 
     SERVICE_NAME = 'glance'
     SERVICE_TYPE = 'image'
     AUTH_USERS = ['glance']
 
-    def get_namespaces(self):
-        return self.SUPPORTED_NAMESPACES
-
     def get_overrides(self, namespace=None):
         overrides = {
             common.HELM_NS_OPENSTACK: {
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/gnocchi.py b/sysinv/sysinv/sysinv/sysinv/helm/gnocchi.py
index f9be2f7d02..4d08caa3c8 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/gnocchi.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/gnocchi.py
@@ -17,16 +17,10 @@ class GnocchiHelm(openstack.OpenstackBaseHelm):
     """Class to encapsulate helm operations for the gnocchi chart"""
 
     CHART = constants.HELM_CHART_GNOCCHI
-    SUPPORTED_NAMESPACES = [
-        common.HELM_NS_OPENSTACK
-    ]
 
     SERVICE_NAME = 'gnocchi'
     AUTH_USERS = ['gnocchi']
 
-    def get_namespaces(self):
-        return self.SUPPORTED_NAMESPACES
-
     def get_overrides(self, namespace=None):
         overrides = {
             common.HELM_NS_OPENSTACK: {
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/heat.py b/sysinv/sysinv/sysinv/sysinv/helm/heat.py
index c13238b9ab..8a5af46f7a 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/heat.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/heat.py
@@ -17,16 +17,10 @@ class HeatHelm(openstack.OpenstackBaseHelm):
     """Class to encapsulate helm operations for the heat chart"""
 
     CHART = constants.HELM_CHART_HEAT
-    SUPPORTED_NAMESPACES = [
-        common.HELM_NS_OPENSTACK
-    ]
 
     SERVICE_NAME = constants.HELM_CHART_HEAT
     AUTH_USERS = ['heat', 'heat_trustee', 'heat_stack_user']
 
-    def get_namespaces(self):
-        return self.SUPPORTED_NAMESPACES
-
     def get_overrides(self, namespace=None):
         overrides = {
             common.HELM_NS_OPENSTACK: {
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/horizon.py b/sysinv/sysinv/sysinv/sysinv/helm/horizon.py
index 675e19e76e..190fb8441c 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/horizon.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/horizon.py
@@ -17,15 +17,9 @@ class HorizonHelm(openstack.OpenstackBaseHelm):
     """Class to encapsulate helm operations for the horizon chart"""
 
     CHART = constants.HELM_CHART_HORIZON
-    SUPPORTED_NAMESPACES = [
-        common.HELM_NS_OPENSTACK
-    ]
 
     SERVICE_NAME = 'horizon'
 
-    def get_namespaces(self):
-        return self.SUPPORTED_NAMESPACES
-
     def get_overrides(self, namespace=None):
         overrides = {
             common.HELM_NS_OPENSTACK: {
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/ingress.py b/sysinv/sysinv/sysinv/sysinv/helm/ingress.py
index 21f77a3c9a..ce39f910ea 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/ingress.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/ingress.py
@@ -17,14 +17,12 @@ class IngressHelm(base.BaseHelm):
     """Class to encapsulate helm operations for the ingress chart"""
 
     CHART = constants.HELM_CHART_INGRESS
-    SUPPORTED_NAMESPACES = [
+
+    SUPPORTED_NAMESPACES = base.BaseHelm.SUPPORTED_NAMESPACES + [
         common.HELM_NS_KUBE_SYSTEM,
         common.HELM_NS_OPENSTACK
     ]
 
-    def get_namespaces(self):
-        return self.SUPPORTED_NAMESPACES
-
     def get_overrides(self, namespace=None):
         # Currently have conflicts with ports 80 and 8080, use 8081 for now
         overrides = {
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/ironic.py b/sysinv/sysinv/sysinv/sysinv/helm/ironic.py
index 1ed5b9fe45..c2142e78ef 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/ironic.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/ironic.py
@@ -15,15 +15,9 @@ class IronicHelm(openstack.OpenstackBaseHelm):
     """Class to encapsulate helm operations for the ironic chart"""
 
     CHART = constants.HELM_CHART_IRONIC
-    SUPPORTED_NAMESPACES = [
-        common.HELM_NS_OPENSTACK
-    ]
 
     SERVICE_NAME = constants.HELM_CHART_IRONIC
 
-    def get_namespaces(self):
-        return self.SUPPORTED_NAMESPACES
-
     def get_overrides(self, namespace=None):
         overrides = {
             common.HELM_NS_OPENSTACK: {
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/keystone.py b/sysinv/sysinv/sysinv/sysinv/helm/keystone.py
index ebd4e5fb95..56b430ceeb 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/keystone.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/keystone.py
@@ -23,18 +23,12 @@ class KeystoneHelm(openstack.OpenstackBaseHelm):
     """Class to encapsulate helm operations for the keystone chart"""
 
     CHART = constants.HELM_CHART_KEYSTONE
-    SUPPORTED_NAMESPACES = [
-        common.HELM_NS_OPENSTACK
-    ]
 
     SERVICE_NAME = constants.HELM_CHART_KEYSTONE
     SERVICE_PATH = '/v3'
 
     DEFAULT_DOMAIN_NAME = 'default'
 
-    def get_namespaces(self):
-        return self.SUPPORTED_NAMESPACES
-
     def get_overrides(self, namespace=None):
         overrides = {
             common.HELM_NS_OPENSTACK: {
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/libvirt.py b/sysinv/sysinv/sysinv/sysinv/helm/libvirt.py
index 502a71208c..5631d0f45c 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/libvirt.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/libvirt.py
@@ -17,15 +17,9 @@ class LibvirtHelm(openstack.OpenstackBaseHelm):
     """Class to encapsulate helm operations for the libvirt chart"""
 
     CHART = constants.HELM_CHART_LIBVIRT
-    SUPPORTED_NAMESPACES = [
-        common.HELM_NS_OPENSTACK
-    ]
 
     SERVICE_NAME = 'libvirt'
 
-    def get_namespaces(self):
-        return self.SUPPORTED_NAMESPACES
-
     def get_overrides(self, namespace=None):
         overrides = {
             common.HELM_NS_OPENSTACK: {
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/magnum.py b/sysinv/sysinv/sysinv/sysinv/helm/magnum.py
index eced879bfb..773c0338dc 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/magnum.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/magnum.py
@@ -15,15 +15,9 @@ class MagnumHelm(openstack.OpenstackBaseHelm):
     """Class to encapsulate helm operations for the magnum chart"""
 
     CHART = constants.HELM_CHART_MAGNUM
-    SUPPORTED_NAMESPACES = [
-        common.HELM_NS_OPENSTACK
-    ]
 
     SERVICE_NAME = constants.HELM_CHART_MAGNUM
 
-    def get_namespaces(self):
-        return self.SUPPORTED_NAMESPACES
-
     def get_overrides(self, namespace=None):
         overrides = {
             common.HELM_NS_OPENSTACK: {
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/mariadb.py b/sysinv/sysinv/sysinv/sysinv/helm/mariadb.py
index db9b896781..8b093334db 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/mariadb.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/mariadb.py
@@ -18,9 +18,6 @@ class MariadbHelm(openstack.OpenstackBaseHelm):
     """Class to encapsulate helm operations for the mariadb chart"""
 
     CHART = constants.HELM_CHART_MARIADB
-    SUPPORTED_NAMESPACES = [
-        common.HELM_NS_OPENSTACK
-    ]
 
     def _num_server_replicas(self):
         # For now we want to run with a single mariadb server pod for the
@@ -30,9 +27,6 @@ class MariadbHelm(openstack.OpenstackBaseHelm):
         else:
             return self._num_controllers()
 
-    def get_namespaces(self):
-        return self.SUPPORTED_NAMESPACES
-
     def get_overrides(self, namespace=None):
         overrides = {
             common.HELM_NS_OPENSTACK: {
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/memcached.py b/sysinv/sysinv/sysinv/sysinv/helm/memcached.py
index 63c5e0825f..c9e208a200 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/memcached.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/memcached.py
@@ -17,12 +17,8 @@ class MemcachedHelm(base.BaseHelm):
     """Class to encapsulate helm operations for the memcached chart"""
 
     CHART = constants.HELM_CHART_MEMCACHED
-    SUPPORTED_NAMESPACES = [
-        common.HELM_NS_OPENSTACK
-    ]
-
-    def get_namespaces(self):
-        return self.SUPPORTED_NAMESPACES
+    SUPPORTED_NAMESPACES = \
+        base.BaseHelm.SUPPORTED_NAMESPACES + [common.HELM_NS_OPENSTACK]
 
     def get_overrides(self, namespace=None):
         overrides = {
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/neutron.py b/sysinv/sysinv/sysinv/sysinv/helm/neutron.py
index 9db377f7fa..c900d70472 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/neutron.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/neutron.py
@@ -23,17 +23,11 @@ class NeutronHelm(openstack.OpenstackBaseHelm):
     """Class to encapsulate helm operations for the neutron chart"""
 
     CHART = constants.HELM_CHART_NEUTRON
-    SUPPORTED_NAMESPACES = [
-        common.HELM_NS_OPENSTACK
-    ]
 
     SERVICE_NAME = 'neutron'
     AUTH_USERS = ['neutron']
     SERVICE_USERS = ['nova']
 
-    def get_namespaces(self):
-        return self.SUPPORTED_NAMESPACES
-
     def get_overrides(self, namespace=None):
         overrides = {
             common.HELM_NS_OPENSTACK: {
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/nova.py b/sysinv/sysinv/sysinv/sysinv/helm/nova.py
index 7a6b5b58ad..5715271aa6 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/nova.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/nova.py
@@ -38,17 +38,11 @@ class NovaHelm(openstack.OpenstackBaseHelm):
     """Class to encapsulate helm operations for the nova chart"""
 
     CHART = constants.HELM_CHART_NOVA
-    SUPPORTED_NAMESPACES = [
-        common.HELM_NS_OPENSTACK
-    ]
 
     SERVICE_NAME = 'nova'
     AUTH_USERS = ['nova', 'placement']
     SERVICE_USERS = ['neutron', 'ironic']
 
-    def get_namespaces(self):
-        return self.SUPPORTED_NAMESPACES
-
     def get_overrides(self, namespace=None):
         scheduler_filters = SCHEDULER_FILTERS_COMMON
 
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/nova_api_proxy.py b/sysinv/sysinv/sysinv/sysinv/helm/nova_api_proxy.py
index 911deae90e..b3d3f067b5 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/nova_api_proxy.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/nova_api_proxy.py
@@ -17,16 +17,10 @@ class NovaApiProxyHelm(openstack.OpenstackBaseHelm):
     """Class to encapsulate helm operations for the nova chart"""
 
     CHART = constants.HELM_CHART_NOVA_API_PROXY
-    SUPPORTED_NAMESPACES = [
-        common.HELM_NS_OPENSTACK
-    ]
 
     SERVICE_NAME = 'nova-api-proxy'
     AUTH_USERS = ['nova']
 
-    def get_namespaces(self):
-        return self.SUPPORTED_NAMESPACES
-
     def get_overrides(self, namespace=None):
 
         overrides = {
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/openstack.py b/sysinv/sysinv/sysinv/sysinv/helm/openstack.py
index 26624e774c..7166bb9cc0 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/openstack.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/openstack.py
@@ -21,6 +21,9 @@ LOG = log.getLogger(__name__)
 class OpenstackBaseHelm(base.BaseHelm):
     """Class to encapsulate Openstack service operations for helm"""
 
+    SUPPORTED_NAMESPACES = \
+        base.BaseHelm.SUPPORTED_NAMESPACES + [common.HELM_NS_OPENSTACK]
+
     def _get_service_config(self, service):
         configs = self.context.setdefault('_service_configs', {})
         if service not in configs:
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/openvswitch.py b/sysinv/sysinv/sysinv/sysinv/helm/openvswitch.py
index 932aa8024b..e9e8699fd9 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/openvswitch.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/openvswitch.py
@@ -17,12 +17,6 @@ class OpenvswitchHelm(openstack.OpenstackBaseHelm):
     """Class to encapsulate helm operations for the openvswitch chart"""
 
     CHART = constants.HELM_CHART_OPENVSWITCH
-    SUPPORTED_NAMESPACES = [
-        common.HELM_NS_OPENSTACK
-    ]
-
-    def get_namespaces(self):
-        return self.SUPPORTED_NAMESPACES
 
     def get_overrides(self, namespace=None):
         overrides = {
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/panko.py b/sysinv/sysinv/sysinv/sysinv/helm/panko.py
index 2183b01b63..0e0254eddd 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/panko.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/panko.py
@@ -17,16 +17,10 @@ class PankoHelm(openstack.OpenstackBaseHelm):
     """Class to encapsulate helm operations for the panko chart"""
 
     CHART = constants.HELM_CHART_PANKO
-    SUPPORTED_NAMESPACES = [
-        common.HELM_NS_OPENSTACK
-    ]
 
     SERVICE_NAME = 'panko'
     AUTH_USERS = ['panko']
 
-    def get_namespaces(self):
-        return self.SUPPORTED_NAMESPACES
-
     def get_overrides(self, namespace=None):
         overrides = {
             common.HELM_NS_OPENSTACK: {
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/rabbitmq.py b/sysinv/sysinv/sysinv/sysinv/helm/rabbitmq.py
index ef4e987aa8..a6455cec4f 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/rabbitmq.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/rabbitmq.py
@@ -17,12 +17,6 @@ class RabbitmqHelm(openstack.OpenstackBaseHelm):
     """Class to encapsulate helm operations for the rabbitmq chart"""
 
     CHART = constants.HELM_CHART_RABBITMQ
-    SUPPORTED_NAMESPACES = [
-        common.HELM_NS_OPENSTACK
-    ]
-
-    def get_namespaces(self):
-        return self.SUPPORTED_NAMESPACES
 
     def get_overrides(self, namespace=None):
         overrides = {
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/rbd_provisioner.py b/sysinv/sysinv/sysinv/sysinv/helm/rbd_provisioner.py
index 1cdc663c06..1b911de167 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/rbd_provisioner.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/rbd_provisioner.py
@@ -19,16 +19,12 @@ class RbdProvisionerHelm(base.BaseHelm):
     """Class to encapsulate helm operations for the rbd-provisioner chart"""
 
     CHART = constants.HELM_CHART_RBD_PROVISIONER
-    SUPPORTED_NAMESPACES = [
-        common.HELM_NS_OPENSTACK
-    ]
+    SUPPORTED_NAMESPACES = \
+        base.BaseHelm.SUPPORTED_NAMESPACES + [common.HELM_NS_OPENSTACK]
 
     SERVICE_NAME = 'rbd-provisioner'
     SERVICE_PORT_MON = 6789
 
-    def get_namespaces(self):
-        return self.SUPPORTED_NAMESPACES
-
     def get_overrides(self, namespace=None):
 
         backends = self.dbapi.storage_backend_get_list()