starlingx
/
config
Code Issues Proposed changes

Move heat static configs to Armada manifest 

Move all heat static configurations from the overrides to the
Armada manifest.

This is being done so we have a consistent way of managing
containerized openstack configurations. Static configurations will
be located in the Armada manifest and dynamic configuration will be
located in the overrides files.

Story: 2003909
Task: 29455

Change-Id: Ie35b1696b9fce0458db724fc8163d5d181e0768a
Signed-off-by: Kristine Bujold <kristine.bujold@windriver.com>
This commit is contained in:
Kristine Bujold 2019-02-15 15:35:40 -05:00
parent 0dd4b86526
commit 99e86fc151
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kubernetes/applications/stx-openstack/stx-openstack-helm/centos/build_srpm.data
View File

@ -1,3 +1,3 @@
SRC_DIR="stx-openstack-helm"
COPY_LIST_TO_TAR="$PKG_BASE/../../../helm-charts/rbd-provisioner $PKG_BASE/../../../helm-charts/garbd"
TIS_PATCH_VER=4
TIS_PATCH_VER=5

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

@ -927,6 +927,10 @@ data:
release_group: osh-openstack-heat
component: test
values:
endpoints:
oslo_cache:
hosts:
default: heat-memcached
labels:
api:
node_selector_key: openstack-control-plane

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

@ -927,6 +927,10 @@ data:
release_group: osh-openstack-heat
component: test
values:
endpoints:
oslo_cache:
hosts:
default: heat-memcached
labels:
api:
node_selector_key: openstack-control-plane

2
sysinv/sysinv/centos/build_srpm.data
View File

@ -1,2 +1,2 @@
SRC_DIR="sysinv"
TIS_PATCH_VER=303
TIS_PATCH_VER=304

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

@ -1,5 +1,5 @@
#
# Copyright (c) 2018 Wind River Systems, Inc.
# Copyright (c) 2018-2019 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
@ -73,11 +73,6 @@ class HeatHelm(openstack.OpenstackBaseHelm):
'auth': self._get_endpoints_identity_overrides(
self.SERVICE_NAME, self.AUTH_USERS),
},
'oslo_cache': {
'hosts': {
'default': 'heat-memcached'
}
},
'oslo_db': {
'auth': self._get_endpoints_oslo_db_overrides(
self.SERVICE_NAME, [self.SERVICE_NAME])