starlingx
/
config
Code Issues Proposed changes

Merge "Provide helm chart for containerized Barbican service"

This commit is contained in:
Zuul 2019-03-18 17:21:03 +00:00 committed by Gerrit Code Review
parent 8efdb4e524 86b27b91aa
commit 05450bc8d4
12 changed files with 99 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml
View File

@ -392,6 +392,56 @@ data:
- helm-toolkit
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: openstack-barbican
data:
chart_name: barbican
release: openstack-barbican
namespace: openstack
wait:
timeout: 1800
labels:
release_group: osh-openstack-barbican
test:
enabled: false
install:
no_hooks: false
upgrade:
no_hooks: false
pre:
delete:
- type: job
labels:
release_group: osh-openstack-barbican
- type: pod
labels:
release_group: osh-openstack-barbican
component: test
values:
labels:
api:
node_selector_key: openstack-control-plane
node_selector_value: enabled
job:
node_selector_key: openstack-control-plane
node_selector_value: enabled
pod:
replicas:
api: 2
affinity:
anti:
type:
default: requiredDuringSchedulingIgnoredDuringExecution
source:
type: tar
location: http://172.17.0.1/helm_charts/barbican-0.1.0.tgz
subpath: barbican
reference: master
dependencies:
- helm-toolkit
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: openstack-glance
@ -2666,6 +2716,16 @@ data:
- openstack-keystone
---
schema: armada/ChartGroup/v1
metadata:
schema: metadata/Document/v1
name: openstack-barbican
data:
description: "Deploy barbican"
sequenced: true
chart_group:
- openstack-barbican
---
schema: armada/ChartGroup/v1
metadata:
schema: metadata/Document/v1
name: openstack-glance
@ -2745,6 +2805,7 @@ data:
- openstack-memcached
- openstack-rabbitmq
- openstack-keystone
- openstack-barbican
- openstack-glance
- openstack-compute-kit
- openstack-heat

1
sysinv/sysinv/sysinv/sysinv/common/constants.py
View File

@ -1520,6 +1520,7 @@ SUPPORTED_HELM_APP_CHARTS = {
HELM_CHART_PANKO,
HELM_CHART_AODH,
HELM_CHART_HELM_TOOLKIT,
HELM_CHART_BARBICAN,
]
}

2
sysinv/sysinv/sysinv/sysinv/helm/aodh.py
View File

@ -87,7 +87,7 @@ class AodhHelm(openstack.OpenstackBaseHelm):
},
'oslo_cache': {
'auth': {
'memcached_secret_key':
'memcache_secret_key':
self._get_common_password('auth_memcache_key')
}
},

31
sysinv/sysinv/sysinv/sysinv/helm/barbican.py
View File

@ -14,18 +14,19 @@ class BarbicanHelm(openstack.OpenstackBaseHelm):
"""Class to encapsulate helm operations for the barbican chart"""
CHART = constants.HELM_CHART_BARBICAN
AUTH_USERS = ['barbican']
SERVICE_NAME = constants.HELM_CHART_BARBICAN
def get_overrides(self, namespace=None):
overrides = {
common.HELM_NS_OPENSTACK: {
'images': self._get_images_overrides(),
'pod': {
'replicas': {
'api': self._num_controllers()
}
}
},
'endpoints': self._get_endpoints_overrides(),
'images': self._get_images_overrides()
}
}
@ -37,6 +38,30 @@ class BarbicanHelm(openstack.OpenstackBaseHelm):
else:
return overrides
def _get_endpoints_overrides(self):
return {
'identity': {
'auth': self._get_endpoints_identity_overrides(
self.SERVICE_NAME, self.AUTH_USERS),
'host_fqdn_override': self._get_endpoints_host_fqdn_overrides(
self.SERVICE_NAME)
},
'oslo_db': {
'auth': self._get_endpoints_oslo_db_overrides(
self.SERVICE_NAME, self.AUTH_USERS)
},
'oslo_cache': {
'auth': {
'memcache_secret_key':
self._get_common_password('auth_memcache_key')
}
},
'oslo_messaging': {
'auth': self._get_endpoints_oslo_messaging_overrides(
self.SERVICE_NAME, self.AUTH_USERS)
},
}
def _get_images_overrides(self):
heat_image = self._operator.chart_operators[
constants.HELM_CHART_HEAT].docker_image

2
sysinv/sysinv/sysinv/sysinv/helm/ceilometer.py
View File

@ -138,7 +138,7 @@ class CeilometerHelm(openstack.OpenstackBaseHelm):
},
'oslo_cache': {
'auth': {
'memcached_secret_key':
'memcache_secret_key':
self._get_common_password('auth_memcache_key')
}
},

2
sysinv/sysinv/sysinv/sysinv/helm/cinder.py
View File

@ -170,7 +170,7 @@ class CinderHelm(openstack.OpenstackBaseHelm):
},
'oslo_cache': {
'auth': {
'memcached_secret_key':
'memcache_secret_key':
self._get_common_password('auth_memcache_key')
}
},

2
sysinv/sysinv/sysinv/sysinv/helm/glance.py
View File

@ -97,7 +97,7 @@ class GlanceHelm(openstack.OpenstackBaseHelm):
},
'oslo_cache': {
'auth': {
'memcached_secret_key':
'memcache_secret_key':
self._get_common_password('auth_memcache_key')
}
},

2
sysinv/sysinv/sysinv/sysinv/helm/gnocchi.py
View File

@ -71,7 +71,7 @@ class GnocchiHelm(openstack.OpenstackBaseHelm):
},
'oslo_cache': {
'auth': {
'memcached_secret_key':
'memcache_secret_key':
self._get_common_password('auth_memcache_key')
}
},

7
sysinv/sysinv/sysinv/sysinv/helm/keystone.py
View File

@ -203,6 +203,7 @@ class KeystoneHelm(openstack.OpenstackBaseHelm):
"'admin':%(target.role.name)s or 'heat_admin':%(target.user.name)s",
"protected_services": [
["'aodh':%(target.user.name)s"],
["'barbican':%(target.user.name)s"],
["'ceilometer':%(target.user.name)s"],
["'cinder':%(target.user.name)s"],
["'glance':%(target.user.name)s"],
@ -248,12 +249,6 @@ class KeystoneHelm(openstack.OpenstackBaseHelm):
self._get_endpoints_host_fqdn_overrides(
self.SERVICE_NAME),
},
'oslo_cache': {
'auth': {
'memcached_secret_key':
self._get_common_password('auth_memcache_key')
}
},
'oslo_db': {
'auth': self._get_endpoints_oslo_db_overrides(
self.SERVICE_NAME, [self.SERVICE_NAME])

2
sysinv/sysinv/sysinv/sysinv/helm/neutron.py
View File

@ -391,7 +391,7 @@ class NeutronHelm(openstack.OpenstackBaseHelm):
},
'oslo_cache': {
'auth': {
'memcached_secret_key':
'memcache_secret_key':
self._get_common_password('auth_memcache_key')
}
},

2
sysinv/sysinv/sysinv/sysinv/helm/nova.py
View File

@ -160,7 +160,7 @@ class NovaHelm(openstack.OpenstackBaseHelm):
},
'oslo_cache': {
'auth': {
'memcached_secret_key':
'memcache_secret_key':
self._get_common_password('auth_memcache_key')
}
},

2
sysinv/sysinv/sysinv/sysinv/helm/panko.py
View File

@ -76,7 +76,7 @@ class PankoHelm(openstack.OpenstackBaseHelm):
},
'oslo_cache': {
'auth': {
'memcached_secret_key':
'memcache_secret_key':
self._get_common_password('auth_memcache_key')
}
},