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:
parent
0dd4b86526
commit
99e86fc151
|
@ -1,3 +1,3 @@
|
||||||
SRC_DIR="stx-openstack-helm"
|
SRC_DIR="stx-openstack-helm"
|
||||||
COPY_LIST_TO_TAR="$PKG_BASE/../../../helm-charts/rbd-provisioner $PKG_BASE/../../../helm-charts/garbd"
|
COPY_LIST_TO_TAR="$PKG_BASE/../../../helm-charts/rbd-provisioner $PKG_BASE/../../../helm-charts/garbd"
|
||||||
TIS_PATCH_VER=4
|
TIS_PATCH_VER=5
|
||||||
|
|
|
@ -927,6 +927,10 @@ data:
|
||||||
release_group: osh-openstack-heat
|
release_group: osh-openstack-heat
|
||||||
component: test
|
component: test
|
||||||
values:
|
values:
|
||||||
|
endpoints:
|
||||||
|
oslo_cache:
|
||||||
|
hosts:
|
||||||
|
default: heat-memcached
|
||||||
labels:
|
labels:
|
||||||
api:
|
api:
|
||||||
node_selector_key: openstack-control-plane
|
node_selector_key: openstack-control-plane
|
||||||
|
|
|
@ -927,6 +927,10 @@ data:
|
||||||
release_group: osh-openstack-heat
|
release_group: osh-openstack-heat
|
||||||
component: test
|
component: test
|
||||||
values:
|
values:
|
||||||
|
endpoints:
|
||||||
|
oslo_cache:
|
||||||
|
hosts:
|
||||||
|
default: heat-memcached
|
||||||
labels:
|
labels:
|
||||||
api:
|
api:
|
||||||
node_selector_key: openstack-control-plane
|
node_selector_key: openstack-control-plane
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
SRC_DIR="sysinv"
|
SRC_DIR="sysinv"
|
||||||
TIS_PATCH_VER=303
|
TIS_PATCH_VER=304
|
||||||
|
|
|
@ -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
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
|
@ -73,11 +73,6 @@ class HeatHelm(openstack.OpenstackBaseHelm):
|
||||||
'auth': self._get_endpoints_identity_overrides(
|
'auth': self._get_endpoints_identity_overrides(
|
||||||
self.SERVICE_NAME, self.AUTH_USERS),
|
self.SERVICE_NAME, self.AUTH_USERS),
|
||||||
},
|
},
|
||||||
'oslo_cache': {
|
|
||||||
'hosts': {
|
|
||||||
'default': 'heat-memcached'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
'oslo_db': {
|
'oslo_db': {
|
||||||
'auth': self._get_endpoints_oslo_db_overrides(
|
'auth': self._get_endpoints_oslo_db_overrides(
|
||||||
self.SERVICE_NAME, [self.SERVICE_NAME])
|
self.SERVICE_NAME, [self.SERVICE_NAME])
|
||||||
|
|
Loading…
Reference in New Issue