From 0ce137a99a5fe04490dc23d2574beb6b1adbf343 Mon Sep 17 00:00:00 2001 From: Kristine Bujold Date: Mon, 18 Feb 2019 12:56:25 -0500 Subject: [PATCH] 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 --- .../stx-openstack-helm/centos/build_srpm.data | 2 +- .../manifests/manifest-no-tests.yaml | 41 +++++++++++++ .../manifests/manifest.yaml | 41 +++++++++++++ sysinv/sysinv/centos/build_srpm.data | 2 +- .../sysinv/sysinv/sysinv/helm/ceilometer.py | 11 +--- sysinv/sysinv/sysinv/sysinv/helm/gnocchi.py | 57 +------------------ 6 files changed, 88 insertions(+), 66 deletions(-) diff --git a/kubernetes/applications/stx-openstack/stx-openstack-helm/centos/build_srpm.data b/kubernetes/applications/stx-openstack/stx-openstack-helm/centos/build_srpm.data index 7037828a98..074c38202e 100644 --- a/kubernetes/applications/stx-openstack/stx-openstack-helm/centos/build_srpm.data +++ b/kubernetes/applications/stx-openstack/stx-openstack-helm/centos/build_srpm.data @@ -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 diff --git a/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest-no-tests.yaml b/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest-no-tests.yaml index 784efab68b..f6c4ed34f7 100644 --- a/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest-no-tests.yaml +++ b/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest-no-tests.yaml @@ -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 diff --git a/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml b/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml index 8f3f47eab8..de996f660b 100644 --- a/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml +++ b/kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml @@ -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 diff --git a/sysinv/sysinv/centos/build_srpm.data b/sysinv/sysinv/centos/build_srpm.data index be4508a9e5..97482ad914 100644 --- a/sysinv/sysinv/centos/build_srpm.data +++ b/sysinv/sysinv/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="sysinv" -TIS_PATCH_VER=303 +TIS_PATCH_VER=304 diff --git a/sysinv/sysinv/sysinv/sysinv/helm/ceilometer.py b/sysinv/sysinv/sysinv/sysinv/helm/ceilometer.py index e1defe82dc..a29b2b906f 100644 --- a/sysinv/sysinv/sysinv/sysinv/helm/ceilometer.py +++ b/sysinv/sysinv/sysinv/sysinv/helm/ceilometer.py @@ -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): diff --git a/sysinv/sysinv/sysinv/sysinv/helm/gnocchi.py b/sysinv/sysinv/sysinv/sysinv/helm/gnocchi.py index 4d08caa3c8..9595b19faf 100644 --- a/sysinv/sysinv/sysinv/sysinv/helm/gnocchi.py +++ b/sysinv/sysinv/sysinv/sysinv/helm/gnocchi.py @@ -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': {