starlingx
/
config
Code Issues Proposed changes

Update overrides and armada manifests for nova-api-proxy 

Changes include:
 - Enable nova-api-proxy chart in the armada manifests
 - Update the password overrides to use the new password generation
   method which was made in https://review.openstack.org/#/c/613175/

Change-Id: Icc79c89edf3753ca1ef2ab5b79b8a1822880f617
Story: 2004007
Task: 26953
Signed-off-by: Angie Wang <angie.wang@windriver.com>
This commit is contained in:
Angie Wang 2018-11-14 16:59:24 -05:00
parent d30b7e4ac9
commit d5a090a45f
3 changed files with 76 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest-no-tests.yaml
View File

@ -553,6 +553,41 @@ data:
- helm-toolkit
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: openstack-nova-api-proxy
data:
chart_name: nova-api-proxy
release: openstack-nova-api-proxy
namespace: openstack
wait:
timeout: 1800
labels:
release_group: osh-openstack-nova-api-proxy
test:
enabled: false
install:
no_hooks: false
upgrade:
no_hooks: false
pre:
delete:
- type: job
labels:
release_group: osh-openstack-nova-api-proxy
- type: pod
labels:
release_group: osh-openstack-nova-api-proxy
component: test
source:
type: tar
location: http://172.17.0.1/helm_charts/nova-api-proxy-0.1.0.tgz
subpath: nova-api-proxy
reference: master
dependencies:
- helm-toolkit
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: openstack-neutron
@ -2360,6 +2395,7 @@ data:
chart_group:
- openstack-libvirt
- openstack-nova
- openstack-nova-api-proxy
- openstack-neutron
---
schema: armada/ChartGroup/v1

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

@ -553,6 +553,41 @@ data:
- helm-toolkit
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: openstack-nova-api-proxy
data:
chart_name: nova-api-proxy
release: openstack-nova-api-proxy
namespace: openstack
wait:
timeout: 1800
labels:
release_group: osh-openstack-nova-api-proxy
test:
enabled: false
install:
no_hooks: false
upgrade:
no_hooks: false
pre:
delete:
- type: job
labels:
release_group: osh-openstack-nova-api-proxy
- type: pod
labels:
release_group: osh-openstack-nova-api-proxy
component: test
source:
type: tar
location: http://172.17.0.1/helm_charts/nova-api-proxy-0.1.0.tgz
subpath: nova-api-proxy
reference: master
dependencies:
- helm-toolkit
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: openstack-neutron
@ -2358,6 +2393,7 @@ data:
chart_group:
- openstack-libvirt
- openstack-nova
- openstack-nova-api-proxy
- openstack-neutron
---
schema: armada/ChartGroup/v1

21
sysinv/sysinv/sysinv/sysinv/helm/nova_api_proxy.py
View File

@ -57,23 +57,10 @@ class NovaApiProxyHelm(openstack.OpenstackBaseHelm):
else:
return overrides
def _get_endpoints_identity_users_overrides(self):
overrides = {}
overrides.update(self._get_common_users_overrides(self.SERVICE_NAME))
for user in self.AUTH_USERS:
overrides.update({
user: {
'region_name': self._region_name(),
'password': self._get_keyring_password(self.SERVICE_NAME, user)
}
})
return overrides
def _get_endpoints_identity_overrides(self):
return {'auth': self._get_endpoints_identity_users_overrides()}
def _get_endpoints_overrides(self):
return {
'identity': self._get_endpoints_identity_overrides(),
'identity': {
'auth': self._get_endpoints_identity_overrides(
self.SERVICE_NAME, self.AUTH_USERS),
}
}