Merge "clean up duplicated code in sysinv/helm"
This commit is contained in:
commit
9d1cbcddba
@ -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: {
|
||||
|
@ -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: {
|
||||
|
@ -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
|
||||
@ -198,6 +199,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
|
||||
|
@ -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: {
|
||||
|
@ -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: {
|
||||
|
@ -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):
|
||||
|
||||
|
@ -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: {
|
||||
|
@ -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: {
|
||||
|
@ -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: {
|
||||
|
@ -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: {
|
||||
|
@ -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 = {
|
||||
|
@ -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: {
|
||||
|
@ -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: {
|
||||
|
@ -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: {
|
||||
|
@ -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: {
|
||||
|
@ -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: {
|
||||
|
@ -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 = {
|
||||
|
@ -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: {
|
||||
|
@ -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
|
||||
|
||||
|
@ -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 = {
|
||||
|
@ -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:
|
||||
|
@ -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 = {
|
||||
|
@ -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: {
|
||||
|
@ -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 = {
|
||||
|
@ -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()
|
||||
|
Loading…
Reference in New Issue
Block a user