Cleanup unused generators and applications
This commit does following cleanups: - Remove nfs_provisioner helm plugin - Remove references to HELM_APP_OSHELM_DEVELOPER, HELM_APP_OSHELM_MULTINODE and HELM_CHART_NFS_PROVISIONER Story: 2003909 Task: 27502 Change-Id: I5def9b7a78b6c98bf10b22779297fa7fb2ebd7c7 Signed-off-by: Wei Zhou <wei.zhou@windriver.com>
This commit is contained in:
parent
977112e99e
commit
526c0e5c56
|
@ -89,7 +89,6 @@ systemconfig.helm_plugins =
|
|||
mariadb = sysinv.helm.mariadb:MariadbHelm
|
||||
memcached = sysinv.helm.memcached:MemcachedHelm
|
||||
neutron = sysinv.helm.neutron:NeutronHelm
|
||||
nfs-provisioner = sysinv.helm.nfs_provisioner:NfsProvisionerHelm
|
||||
nova = sysinv.helm.nova:NovaHelm
|
||||
nova-api-proxy = sysinv.helm.nova_api_proxy:NovaApiProxyHelm
|
||||
openvswitch = sysinv.helm.openvswitch:OpenvswitchHelm
|
||||
|
|
|
@ -1354,7 +1354,6 @@ HELM_CHART_MAGNUM = 'magnum'
|
|||
HELM_CHART_MARIADB = 'mariadb'
|
||||
HELM_CHART_MEMCACHED = 'memcached'
|
||||
HELM_CHART_NEUTRON = 'neutron'
|
||||
HELM_CHART_NFS_PROVISIONER = 'nfs-provisioner'
|
||||
HELM_CHART_NOVA = 'nova'
|
||||
HELM_CHART_NOVA_API_PROXY = 'nova-api-proxy'
|
||||
HELM_CHART_OPENVSWITCH = 'openvswitch'
|
||||
|
@ -1379,7 +1378,6 @@ SUPPORTED_HELM_CHARTS = [
|
|||
HELM_CHART_MARIADB,
|
||||
HELM_CHART_MEMCACHED,
|
||||
HELM_CHART_NEUTRON,
|
||||
HELM_CHART_NFS_PROVISIONER,
|
||||
HELM_CHART_NOVA,
|
||||
HELM_CHART_NOVA_API_PROXY,
|
||||
HELM_CHART_OPENVSWITCH,
|
||||
|
@ -1389,18 +1387,10 @@ SUPPORTED_HELM_CHARTS = [
|
|||
]
|
||||
|
||||
# Helm: Supported application (aka chart bundles)
|
||||
# TODO (rchurch): remove OSHELM applications.These are temporary chart bundles
|
||||
# until we fully integrate our k8s openstack application. Not
|
||||
# sure at this point if we'll need an AIO flavor (without Ceph
|
||||
# but with NFS support)
|
||||
HELM_APP_OPENSTACK = 'stx-openstack'
|
||||
HELM_APP_OSHELM_DEVELOPER = 'openstack-helm-developer'
|
||||
HELM_APP_OSHELM_MULTINODE = 'openstack-helm-multinode'
|
||||
|
||||
SUPPORTED_HELM_APP_NAMES = [
|
||||
HELM_APP_OPENSTACK,
|
||||
HELM_APP_OSHELM_DEVELOPER,
|
||||
HELM_APP_OSHELM_MULTINODE
|
||||
HELM_APP_OPENSTACK
|
||||
]
|
||||
|
||||
SUPPORTED_HELM_APP_CHARTS = {
|
||||
|
@ -1424,37 +1414,6 @@ SUPPORTED_HELM_APP_CHARTS = {
|
|||
HELM_CHART_CEILOMETER,
|
||||
HELM_CHART_PANKO,
|
||||
HELM_CHART_AODH
|
||||
],
|
||||
HELM_APP_OSHELM_DEVELOPER: [
|
||||
HELM_CHART_INGRESS,
|
||||
HELM_CHART_NFS_PROVISIONER,
|
||||
HELM_CHART_MARIADB,
|
||||
HELM_CHART_RABBITMQ,
|
||||
HELM_CHART_MEMCACHED,
|
||||
HELM_CHART_KEYSTONE,
|
||||
HELM_CHART_HEAT,
|
||||
HELM_CHART_HORIZON,
|
||||
HELM_CHART_GLANCE,
|
||||
HELM_CHART_OPENVSWITCH,
|
||||
HELM_CHART_LIBVIRT,
|
||||
HELM_CHART_NOVA,
|
||||
HELM_CHART_NEUTRON
|
||||
],
|
||||
HELM_APP_OSHELM_MULTINODE: [
|
||||
HELM_CHART_INGRESS,
|
||||
HELM_CHART_MARIADB,
|
||||
HELM_CHART_RABBITMQ,
|
||||
HELM_CHART_MEMCACHED,
|
||||
HELM_CHART_KEYSTONE,
|
||||
HELM_CHART_GLANCE,
|
||||
HELM_CHART_CINDER,
|
||||
HELM_CHART_OPENVSWITCH,
|
||||
HELM_CHART_LIBVIRT,
|
||||
HELM_CHART_NOVA,
|
||||
HELM_CHART_NEUTRON,
|
||||
HELM_CHART_HEAT,
|
||||
HELM_CHART_BARBICAN,
|
||||
HELM_CHART_MAGNUM
|
||||
]
|
||||
}
|
||||
|
||||
|
|
|
@ -1,42 +0,0 @@
|
|||
#
|
||||
# Copyright (c) 2018 Wind River Systems, Inc.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
from sysinv.common import constants
|
||||
from sysinv.common import exception
|
||||
from sysinv.openstack.common import log as logging
|
||||
from . import common
|
||||
from . import openstack
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class NfsProvisionerHelm(openstack.OpenstackBaseHelm):
|
||||
"""Class to encapsulate helm operations for the nfs-provisioner chart"""
|
||||
|
||||
CHART = constants.HELM_CHART_NFS_PROVISIONER
|
||||
SUPPORTED_NAMESPACES = [
|
||||
common.HELM_NS_NFS
|
||||
]
|
||||
|
||||
def get_namespaces(self):
|
||||
return self.SUPPORTED_NAMESPACES
|
||||
|
||||
def get_overrides(self, namespace=None):
|
||||
overrides = {
|
||||
common.HELM_NS_NFS: {
|
||||
'storageclass': {
|
||||
'name': 'general'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if namespace in self.SUPPORTED_NAMESPACES:
|
||||
return overrides[namespace]
|
||||
elif namespace:
|
||||
raise exception.InvalidHelmNamespace(chart=self.CHART,
|
||||
namespace=namespace)
|
||||
else:
|
||||
return overrides
|
Loading…
Reference in New Issue