starlingx/config
Code Issues Proposed changes

Update Ceilometer Helm conf overrides

Browse Source 
This update is to configure ceilometer messaging_urls in sysinv
overrides instead of armada manifest to allow us to set the
randomly-generated password for accessing messaging queues.

Change-Id: I08c7d5292611ecc7876b742cc5f537273272ee91
Story: 2003909
Task: 27083
Signed-off-by: Angie Wang <angie.wang@windriver.com>
This commit is contained in:
Angie Wang
2018-11-13 10:18:51 -05:00
parent 14258b8c15
commit 7997ab9ac1
3 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -911,16 +911,6 @@ data:
oslo_messaging_notifications:
topics:
- notifications
notification:
messaging_urls:
values:
- rabbit://rabbitmq-admin:4xWhfGjdQts1SyvXJXs5@rabbitmq.openstack.svc.cluster.local:5672/ceilometer
- rabbit://rabbitmq-admin:4xWhfGjdQts1SyvXJXs5@rabbitmq.openstack.svc.cluster.local:5672/cinder
- rabbit://rabbitmq-admin:4xWhfGjdQts1SyvXJXs5@rabbitmq.openstack.svc.cluster.local:5672/glance
- rabbit://rabbitmq-admin:4xWhfGjdQts1SyvXJXs5@rabbitmq.openstack.svc.cluster.local:5672/nova
- rabbit://rabbitmq-admin:4xWhfGjdQts1SyvXJXs5@rabbitmq.openstack.svc.cluster.local:5672/keystone
- rabbit://rabbitmq-admin:4xWhfGjdQts1SyvXJXs5@rabbitmq.openstack.svc.cluster.local:5672/neutron
- rabbit://rabbitmq-admin:4xWhfGjdQts1SyvXJXs5@rabbitmq.openstack.svc.cluster.local:5672/heat
pipeline:
sources:
- name: meter_source

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

@@ -909,16 +909,6 @@ data:
oslo_messaging_notifications:
topics:
- notifications
notification:
messaging_urls:
values:
- rabbit://rabbitmq-admin:4xWhfGjdQts1SyvXJXs5@rabbitmq.openstack.svc.cluster.local:5672/ceilometer
- rabbit://rabbitmq-admin:4xWhfGjdQts1SyvXJXs5@rabbitmq.openstack.svc.cluster.local:5672/cinder
- rabbit://rabbitmq-admin:4xWhfGjdQts1SyvXJXs5@rabbitmq.openstack.svc.cluster.local:5672/glance
- rabbit://rabbitmq-admin:4xWhfGjdQts1SyvXJXs5@rabbitmq.openstack.svc.cluster.local:5672/nova
- rabbit://rabbitmq-admin:4xWhfGjdQts1SyvXJXs5@rabbitmq.openstack.svc.cluster.local:5672/keystone
- rabbit://rabbitmq-admin:4xWhfGjdQts1SyvXJXs5@rabbitmq.openstack.svc.cluster.local:5672/neutron
- rabbit://rabbitmq-admin:4xWhfGjdQts1SyvXJXs5@rabbitmq.openstack.svc.cluster.local:5672/heat
pipeline:
sources:
- name: meter_source

16
sysinv/sysinv/sysinv/sysinv/helm/ceilometer.py
View File

@@ -126,9 +126,23 @@ class CeilometerHelm(openstack.OpenstackBaseHelm):
else:
batch_timeout = 5
notification_overrides.update({'batch_timeout': batch_timeout})
notification_overrides.update(
{'batch_timeout': batch_timeout,
'messaging_urls': {'values': self._get_notification_messaging_urls()}})
return notification_overrides
def _get_notification_messaging_urls(self):
rabbit_user = 'rabbitmq-admin'
rabbit_pass = self._get_common_password(rabbit_user)
rabbit_paths = ['/ceilometer', '/cinder', '/glance', '/nova', '/keystone', '/neutron', '/heat']
messaging_urls = []
for rabbit_path in rabbit_paths:
messaging_urls += \
['rabbit://%s:%s@rabbitmq.openstack.svc.cluster.local:5672%s' % (rabbit_user, rabbit_pass, rabbit_path)]
return messaging_urls
def _get_endpoints_overrides(self):
return {
'identity': {