starlingx
/
config
Code Issues Proposed changes

Move gnocchi and ceilometer static configs 

Move all gnocchi and ceilometer 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: 29535

Change-Id: Ieab861cb1751146b70f722e70b8f89d81c0ed9a5
Signed-off-by: Kristine Bujold <kristine.bujold@windriver.com>
This commit is contained in:
Kristine Bujold 2019-02-18 12:56:25 -05:00
parent 0dd4b86526
commit 0ce137a99a
6 changed files with 88 additions and 66 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

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

@ -1102,6 +1102,45 @@ data:
anti:
type:
default: requiredDuringSchedulingIgnoredDuringExecution
gnocchi:
indexer:
driver: mariadb
keystone_authtoken:
interface: internal
dependencies:
static:
db_sync:
jobs:
- gnocchi-storage-init
- gnocchi-db-init
services:
- endpoint: internal
service: oslo_db
metricd:
services:
- endpoint: internal
service: oslo_db
- endpoint: internal
service: oslo_cache
- endpoint: internal
service: metric
tests:
services:
- endpoint: internal
service: identity
- endpoint: internal
service: oslo_db
- endpoint: internal
service: metric
manifests:
daemonset_statsd: false
job_db_init_indexer: false
secret_db_indexer: false
service_statsd: false
endpoints:
oslo_cache:
hosts:
default: memcached
source:
type: tar
location: http://172.17.0.1/helm_charts/gnocchi-0.1.0.tgz
@ -1265,6 +1304,8 @@ data:
oslo_messaging_notifications:
topics:
- notifications
notification:
batch_size: 100
pipeline:
sources:
- name: meter_source

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

@ -1102,6 +1102,45 @@ data:
anti:
type:
default: requiredDuringSchedulingIgnoredDuringExecution
gnocchi:
indexer:
driver: mariadb
keystone_authtoken:
interface: internal
dependencies:
static:
db_sync:
jobs:
- gnocchi-storage-init
- gnocchi-db-init
services:
- endpoint: internal
service: oslo_db
metricd:
services:
- endpoint: internal
service: oslo_db
- endpoint: internal
service: oslo_cache
- endpoint: internal
service: metric
tests:
services:
- endpoint: internal
service: identity
- endpoint: internal
service: oslo_db
- endpoint: internal
service: metric
manifests:
daemonset_statsd: false
job_db_init_indexer: false
secret_db_indexer: false
service_statsd: false
endpoints:
oslo_cache:
hosts:
default: memcached
source:
type: tar
location: http://172.17.0.1/helm_charts/gnocchi-0.1.0.tgz
@ -1265,6 +1304,8 @@ data:
oslo_messaging_notifications:
topics:
- notifications
notification:
batch_size: 100
pipeline:
sources:
- name: meter_source

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

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

11
sysinv/sysinv/sysinv/sysinv/helm/ceilometer.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
#
@ -112,19 +112,14 @@ class CeilometerHelm(openstack.OpenstackBaseHelm):
return shared_services_types
def _get_conf_ceilometer_notification_overrides(self):
notification_overrides = {
'batch_size': 100
}
system = self._get_system()
if system.system_type == constants.TIS_AIO_BUILD:
batch_timeout = 25
else:
batch_timeout = 5
notification_overrides.update(
{'batch_timeout': batch_timeout,
'messaging_urls': {'values': self._get_notification_messaging_urls()}})
notification_overrides = {'batch_timeout': batch_timeout,
'messaging_urls': {'values': self._get_notification_messaging_urls()}}
return notification_overrides
def _get_notification_messaging_urls(self):

57
sysinv/sysinv/sysinv/sysinv/helm/gnocchi.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
#
@ -26,11 +26,6 @@ class GnocchiHelm(openstack.OpenstackBaseHelm):
common.HELM_NS_OPENSTACK: {
'images': self._get_images_overrides(),
'pod': self._get_pod_overrides(),
'conf': self._get_conf_overrides(),
'dependencies': {
'static': self._get_static_dependencies_overrides()
},
'manifests': self._get_manifests_overrides(),
'endpoints': self._get_endpoints_overrides(),
}
}
@ -68,53 +63,6 @@ class GnocchiHelm(openstack.OpenstackBaseHelm):
}
}
def _get_static_dependencies_overrides(self):
return {
'db_sync': {
'jobs': [
'gnocchi-storage-init',
'gnocchi-db-init',
],
'services': [
{'endpoint': 'internal', 'service': 'oslo_db'}
]
},
'metricd': {
'services': [
{'endpoint': 'internal', 'service': 'oslo_db'},
{'endpoint': 'internal', 'service': 'oslo_cache'},
{'endpoint': 'internal', 'service': 'metric'}
]
},
'tests': {
'services': [
{'endpoint': 'internal', 'service': 'identity'},
{'endpoint': 'internal', 'service': 'oslo_db'},
{'endpoint': 'internal', 'service': 'metric'}
]
}
}
def _get_manifests_overrides(self):
return {
'daemonset_statsd': False,
'service_statsd': False,
'job_db_init_indexer': False,
'secret_db_indexer': False,
}
def _get_conf_overrides(self):
return {
'gnocchi': {
'indexer': {
'driver': 'mariadb'
},
'keystone_authtoken': {
'interface': 'internal'
}
}
}
def _get_endpoints_overrides(self):
return {
'identity': {
@ -125,9 +73,6 @@ class GnocchiHelm(openstack.OpenstackBaseHelm):
'auth': {
'memcached_secret_key':
self._get_common_password('auth_memcache_key')
},
'hosts': {
'default': 'memcached'
}
},
'oslo_db': {