From 72b0d3c982d93000e011d3f7ffc5cfac5339a16a Mon Sep 17 00:00:00 2001 From: Angie Wang Date: Wed, 27 Feb 2019 16:29:40 -0500 Subject: [PATCH] Ceilometer chart: update messaging_urls and cache server Currently, ceilometer is not listening to the notifications which sent from the openstack services as the messaging_urls isn't configured properly. The commit updates the messaging_urls with the correct type and the default value. The configuration for the cache server is also added. With the cache server configured, ceilometer will not update the resource metadata through gnocchi client if the resource is not changed. Change-Id: I77e5acf3da31e211c444032f26d7625e51d8b0a9 Story: 2005019 Task: 29746 Signed-off-by: Angie Wang --- ceilometer/templates/configmap-etc.yaml | 4 ++++ ceilometer/values.yaml | 17 +++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/ceilometer/templates/configmap-etc.yaml b/ceilometer/templates/configmap-etc.yaml index 43a69d74fe..c48a3b8b11 100644 --- a/ceilometer/templates/configmap-etc.yaml +++ b/ceilometer/templates/configmap-etc.yaml @@ -32,6 +32,10 @@ limitations under the License. {{- $_ := set .Values.conf.ceilometer.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}} {{- end -}} +{{- if empty .Values.conf.ceilometer.cache.memcache_servers -}} +{{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.ceilometer.cache "memcache_servers" -}} +{{- end -}} + {{- if empty .Values.conf.ceilometer.database.connection -}} {{- $_ := tuple "oslo_db" "internal" "ceilometer" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.ceilometer.database "connection" -}} {{- end -}} diff --git a/ceilometer/values.yaml b/ceilometer/values.yaml index 31d733a52d..fc3cce0fc7 100644 --- a/ceilometer/values.yaml +++ b/ceilometer/values.yaml @@ -119,12 +119,25 @@ conf: auth_type: password interface: internal notification: - messaging_urls: null + messaging_urls: + type: multistring + values: + - rabbit://rabbitmq:password@rabbitmq.openstack.svc.cluster.local:5672/ceilometer + - rabbit://rabbitmq:password@rabbitmq.openstack.svc.cluster.local:5672/cinder + - rabbit://rabbitmq:password@rabbitmq.openstack.svc.cluster.local:5672/glance + - rabbit://rabbitmq:password@rabbitmq.openstack.svc.cluster.local:5672/nova + - rabbit://rabbitmq:password@rabbitmq.openstack.svc.cluster.local:5672/keystone + - rabbit://rabbitmq:password@rabbitmq.openstack.svc.cluster.local:5672/neutron + - rabbit://rabbitmq:password@rabbitmq.openstack.svc.cluster.local:5672/heat oslo_messaging_notifications: driver: messagingv2 topics: - notifications - profiler + cache: + enabled: true + backend: dogpile.cache.memcached + expiration_time: 86400 event_definitions: - event_type: 'compute.instance.*' traits: &instance_traits @@ -1784,7 +1797,7 @@ endpoints: # and memcache service. memcache_secret_key: null hosts: - default: memcache + default: memcached host_fqdn_override: default: null port: