Browse Source

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 <angie.wang@windriver.com>
Angie Wang 1 month ago
parent
commit
72b0d3c982
2 changed files with 19 additions and 2 deletions
  1. 4
    0
      ceilometer/templates/configmap-etc.yaml
  2. 15
    2
      ceilometer/values.yaml

+ 4
- 0
ceilometer/templates/configmap-etc.yaml View File

@@ -32,6 +32,10 @@ limitations under the License.
32 32
 {{- $_ := set .Values.conf.ceilometer.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}}
33 33
 {{- end -}}
34 34
 
35
+{{- if empty .Values.conf.ceilometer.cache.memcache_servers -}}
36
+{{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.ceilometer.cache "memcache_servers" -}}
37
+{{- end -}}
38
+
35 39
 {{- if empty .Values.conf.ceilometer.database.connection -}}
36 40
 {{- $_ := tuple "oslo_db" "internal" "ceilometer" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.ceilometer.database "connection" -}}
37 41
 {{- end -}}

+ 15
- 2
ceilometer/values.yaml View File

@@ -119,12 +119,25 @@ conf:
119 119
       auth_type: password
120 120
       interface: internal
121 121
     notification:
122
-      messaging_urls: null
122
+      messaging_urls:
123
+        type: multistring
124
+        values:
125
+          - rabbit://rabbitmq:password@rabbitmq.openstack.svc.cluster.local:5672/ceilometer
126
+          - rabbit://rabbitmq:password@rabbitmq.openstack.svc.cluster.local:5672/cinder
127
+          - rabbit://rabbitmq:password@rabbitmq.openstack.svc.cluster.local:5672/glance
128
+          - rabbit://rabbitmq:password@rabbitmq.openstack.svc.cluster.local:5672/nova
129
+          - rabbit://rabbitmq:password@rabbitmq.openstack.svc.cluster.local:5672/keystone
130
+          - rabbit://rabbitmq:password@rabbitmq.openstack.svc.cluster.local:5672/neutron
131
+          - rabbit://rabbitmq:password@rabbitmq.openstack.svc.cluster.local:5672/heat
123 132
     oslo_messaging_notifications:
124 133
       driver: messagingv2
125 134
       topics:
126 135
         - notifications
127 136
         - profiler
137
+    cache:
138
+      enabled: true
139
+      backend: dogpile.cache.memcached
140
+      expiration_time: 86400
128 141
   event_definitions:
129 142
     - event_type: 'compute.instance.*'
130 143
       traits: &instance_traits
@@ -1784,7 +1797,7 @@ endpoints:
1784 1797
       # and memcache service.
1785 1798
       memcache_secret_key: null
1786 1799
     hosts:
1787
-      default: memcache
1800
+      default: memcached
1788 1801
     host_fqdn_override:
1789 1802
       default: null
1790 1803
     port:

Loading…
Cancel
Save