Revert "Integrate openstack clients helm chart in armada"
This reverts commit 248d3b3921
.
Change-Id: I06931b7f5ae047ec93eaa0ee553e35577ceb433b
Signed-off-by: Stefan Dinescu <stefan.dinescu@windriver.com>
This commit is contained in:
parent
f5aca7e497
commit
cfa6e2108b
|
@ -3016,52 +3016,6 @@ data:
|
||||||
dependencies:
|
dependencies:
|
||||||
- helm-toolkit
|
- helm-toolkit
|
||||||
---
|
---
|
||||||
schema: armada/Chart/v1
|
|
||||||
metadata:
|
|
||||||
schema: metadata/Document/v1
|
|
||||||
name: openstack-clients
|
|
||||||
data:
|
|
||||||
chart_name: clients
|
|
||||||
release: openstack-clients
|
|
||||||
namespace: openstack
|
|
||||||
wait:
|
|
||||||
timeout: 600
|
|
||||||
labels:
|
|
||||||
app: openstack-clients
|
|
||||||
install:
|
|
||||||
no_hooks: false
|
|
||||||
upgrade:
|
|
||||||
no_hooks: false
|
|
||||||
pre:
|
|
||||||
delete:
|
|
||||||
- type: job
|
|
||||||
labels:
|
|
||||||
app: openstack-clients
|
|
||||||
values:
|
|
||||||
endpoints:
|
|
||||||
identity:
|
|
||||||
name: keystone
|
|
||||||
namespace: openstack
|
|
||||||
labels:
|
|
||||||
node_selector_key: openstack-control-plane
|
|
||||||
node_selector_value: enabled
|
|
||||||
global:
|
|
||||||
cloud_name: openstack_helm
|
|
||||||
replicas: 1
|
|
||||||
keep_running: true
|
|
||||||
volume:
|
|
||||||
size: 20Gi
|
|
||||||
images:
|
|
||||||
tags:
|
|
||||||
openstackclients: docker.io/starlingx/stx-openstackclients:master-centos-stable-latest
|
|
||||||
source:
|
|
||||||
type: tar
|
|
||||||
location: http://172.17.0.1/helm_charts/starlingx/clients-0.1.0.tgz
|
|
||||||
subpath: clients
|
|
||||||
reference: master
|
|
||||||
dependencies:
|
|
||||||
- helm-toolkit
|
|
||||||
---
|
|
||||||
schema: armada/ChartGroup/v1
|
schema: armada/ChartGroup/v1
|
||||||
metadata:
|
metadata:
|
||||||
schema: metadata/Document/v1
|
schema: metadata/Document/v1
|
||||||
|
@ -3219,16 +3173,6 @@ data:
|
||||||
- openstack-panko
|
- openstack-panko
|
||||||
- openstack-ceilometer
|
- openstack-ceilometer
|
||||||
---
|
---
|
||||||
schema: armada/ChartGroup/v1
|
|
||||||
metadata:
|
|
||||||
schema: metadata/Document/v1
|
|
||||||
name: openstack-clients
|
|
||||||
data:
|
|
||||||
description: "Deploy clients"
|
|
||||||
sequenced: false
|
|
||||||
chart_group:
|
|
||||||
- openstack-clients
|
|
||||||
---
|
|
||||||
schema: armada/Manifest/v1
|
schema: armada/Manifest/v1
|
||||||
metadata:
|
metadata:
|
||||||
schema: metadata/Document/v1
|
schema: metadata/Document/v1
|
||||||
|
@ -3242,7 +3186,6 @@ data:
|
||||||
- openstack-memcached
|
- openstack-memcached
|
||||||
- openstack-rabbitmq
|
- openstack-rabbitmq
|
||||||
- openstack-keystone
|
- openstack-keystone
|
||||||
- openstack-clients
|
|
||||||
- openstack-barbican
|
- openstack-barbican
|
||||||
- openstack-glance
|
- openstack-glance
|
||||||
- openstack-cinder
|
- openstack-cinder
|
||||||
|
|
|
@ -105,7 +105,6 @@ systemconfig.helm_plugins.stx_openstack =
|
||||||
022_keystone-api-proxy = sysinv.helm.keystone_api_proxy:KeystoneApiProxyHelm
|
022_keystone-api-proxy = sysinv.helm.keystone_api_proxy:KeystoneApiProxyHelm
|
||||||
023_ceph-rgw = sysinv.helm.swift:SwiftHelm
|
023_ceph-rgw = sysinv.helm.swift:SwiftHelm
|
||||||
024_ironic = sysinv.helm.ironic:IronicHelm
|
024_ironic = sysinv.helm.ironic:IronicHelm
|
||||||
025_clients = sysinv.helm.openstackclients:OpenstackClientsHelm
|
|
||||||
|
|
||||||
sysinv.agent.lldp.drivers =
|
sysinv.agent.lldp.drivers =
|
||||||
lldpd = sysinv.agent.lldp.drivers.lldpd.driver:SysinvLldpdAgentDriver
|
lldpd = sysinv.agent.lldp.drivers.lldpd.driver:SysinvLldpdAgentDriver
|
||||||
|
|
|
@ -1434,7 +1434,6 @@ HELM_CHART_AODH = 'aodh'
|
||||||
HELM_CHART_BARBICAN = 'barbican'
|
HELM_CHART_BARBICAN = 'barbican'
|
||||||
HELM_CHART_CEILOMETER = 'ceilometer'
|
HELM_CHART_CEILOMETER = 'ceilometer'
|
||||||
HELM_CHART_CINDER = 'cinder'
|
HELM_CHART_CINDER = 'cinder'
|
||||||
HELM_CHART_CLIENTS = 'clients'
|
|
||||||
HELM_CHART_GARBD = 'garbd'
|
HELM_CHART_GARBD = 'garbd'
|
||||||
HELM_CHART_GLANCE = 'glance'
|
HELM_CHART_GLANCE = 'glance'
|
||||||
HELM_CHART_GNOCCHI = 'gnocchi'
|
HELM_CHART_GNOCCHI = 'gnocchi'
|
||||||
|
|
|
@ -73,21 +73,6 @@ class OpenstackBaseHelm(base.BaseHelm):
|
||||||
constants.HELM_CHART_KEYSTONE]
|
constants.HELM_CHART_KEYSTONE]
|
||||||
return keystone_operator.get_admin_user_name()
|
return keystone_operator.get_admin_user_name()
|
||||||
|
|
||||||
def _get_admin_project_name(self):
|
|
||||||
keystone_operator = self._operator.chart_operators[
|
|
||||||
constants.HELM_CHART_KEYSTONE]
|
|
||||||
return keystone_operator.get_admin_project_name()
|
|
||||||
|
|
||||||
def _get_admin_project_domain(self):
|
|
||||||
keystone_operator = self._operator.chart_operators[
|
|
||||||
constants.HELM_CHART_KEYSTONE]
|
|
||||||
return keystone_operator.get_admin_project_domain()
|
|
||||||
|
|
||||||
def _get_admin_user_domain(self):
|
|
||||||
keystone_operator = self._operator.chart_operators[
|
|
||||||
constants.HELM_CHART_KEYSTONE]
|
|
||||||
return keystone_operator.get_admin_user_domain()
|
|
||||||
|
|
||||||
def _get_identity_password(self, service, user):
|
def _get_identity_password(self, service, user):
|
||||||
passwords = self.context.setdefault('_service_passwords', {})
|
passwords = self.context.setdefault('_service_passwords', {})
|
||||||
if service not in passwords:
|
if service not in passwords:
|
||||||
|
|
|
@ -1,49 +0,0 @@
|
||||||
#
|
|
||||||
# Copyright (c) 2019 Wind River Systems, Inc.
|
|
||||||
#
|
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
|
||||||
#
|
|
||||||
|
|
||||||
from sysinv.common import constants
|
|
||||||
from sysinv.common import exception
|
|
||||||
from sysinv.helm import common
|
|
||||||
from sysinv.openstack.common import log as logging
|
|
||||||
from sysinv.helm import openstack
|
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
class OpenstackClientsHelm(openstack.OpenstackBaseHelm):
|
|
||||||
|
|
||||||
CHART = constants.HELM_CHART_CLIENTS
|
|
||||||
SERVICE_NAME = constants.HELM_CHART_CLIENTS
|
|
||||||
|
|
||||||
def get_overrides(self, namespace=None):
|
|
||||||
|
|
||||||
overrides = {
|
|
||||||
common.HELM_NS_OPENSTACK: {
|
|
||||||
"endpoints": self._get_endpoints_overrides()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if namespace in self.SUPPORTED_NAMESPACES:
|
|
||||||
return overrides[namespace]
|
|
||||||
elif namespace:
|
|
||||||
raise exception.InvalidHelmNamespace(chart=self.CHART,
|
|
||||||
namespace=namespace)
|
|
||||||
else:
|
|
||||||
return overrides
|
|
||||||
|
|
||||||
def _get_endpoints_overrides(self):
|
|
||||||
overrides = self._get_common_users_overrides(
|
|
||||||
common.SERVICE_ADMIN)
|
|
||||||
overrides['admin'].update({
|
|
||||||
'project_name': self._get_admin_project_name(),
|
|
||||||
'project_domain_name': self._get_admin_project_domain(),
|
|
||||||
'user_domain_name': self._get_admin_user_domain(),
|
|
||||||
})
|
|
||||||
return {
|
|
||||||
'identity': {
|
|
||||||
'auth': overrides
|
|
||||||
},
|
|
||||||
}
|
|
Loading…
Reference in New Issue