From 2375c4206a9ac1d5b4143d4e2887d9cdc03ce2b8 Mon Sep 17 00:00:00 2001 From: Angie Wang Date: Mon, 19 Nov 2018 16:54:22 -0500 Subject: [PATCH] Updates overrides for telemetry services A few updates: - Add the image override for gnocchi resources cleaner job. - Fix the image override for panko db sync. - Fix the ceilometer configuration overrides in armada manifests. Change-Id: I8f18cc334b5c1aa7a8a0f1f35590b16ce96bf6b2 Story: 2003909 Task: 27083 Depends-On: https://review.openstack.org/618889 Signed-off-by: Angie Wang --- .../stx-openstack-helm/manifests/manifest-no-tests.yaml | 4 ++-- .../stx-openstack-helm/manifests/manifest.yaml | 4 ++-- sysinv/sysinv/sysinv/sysinv/helm/gnocchi.py | 1 + sysinv/sysinv/sysinv/sysinv/helm/panko.py | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) 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 bb04700edf..6b0123997f 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 @@ -1028,8 +1028,8 @@ data: shuffle_time_before_polling_task: 30 batch_polled_samples: true dispatcher_gnocchi: - archive_policy: null - filter_project: null + archive_policy: '' + filter_project: '' cache: expiration_time: 86400 compute: 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 1ccabb0a6e..8103b6a7fd 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 @@ -1026,8 +1026,8 @@ data: shuffle_time_before_polling_task: 30 batch_polled_samples: true dispatcher_gnocchi: - archive_policy: null - filter_project: null + archive_policy: '' + filter_project: '' cache: expiration_time: 86400 compute: diff --git a/sysinv/sysinv/sysinv/sysinv/helm/gnocchi.py b/sysinv/sysinv/sysinv/sysinv/helm/gnocchi.py index 14aa20a5cd..7711527640 100644 --- a/sysinv/sysinv/sysinv/sysinv/helm/gnocchi.py +++ b/sysinv/sysinv/sysinv/sysinv/helm/gnocchi.py @@ -66,6 +66,7 @@ class GnocchiHelm(openstack.OpenstackBaseHelm): 'db_sync': self.docker_image, 'gnocchi_api': self.docker_image, 'gnocchi_metricd': self.docker_image, + 'gnocchi_resources_cleaner': self.docker_image, 'ks_endpoints': heat_image, 'ks_service': heat_image, 'ks_user': heat_image, diff --git a/sysinv/sysinv/sysinv/sysinv/helm/panko.py b/sysinv/sysinv/sysinv/sysinv/helm/panko.py index cd5489ab14..8f6270f4d4 100644 --- a/sysinv/sysinv/sysinv/sysinv/helm/panko.py +++ b/sysinv/sysinv/sysinv/sysinv/helm/panko.py @@ -55,7 +55,7 @@ class PankoHelm(openstack.OpenstackBaseHelm): 'bootstrap': heat_image, 'db_drop': heat_image, 'db_init': self.docker_image, - 'db_sync': self.docker_image, + 'panko_db_sync': self.docker_image, 'panko_api': self.docker_image, 'panko_events_cleaner': self.docker_image, 'ks_endpoints': heat_image,