starlingx
/
config
Code Issues Proposed changes

Merge "ceilometer for containerized openstack services"

This commit is contained in:
Zuul 2019-09-17 20:02:25 +00:00 committed by Gerrit Code Review
parent 95e2789a8c 6c606f90d8
commit 31cb1b3df7
2 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,6 @@
# SPDX-License-Identifier: Apache-2.0
#
from sysinv.common import constants
from sysinv.common import exception
from sysinv.common import utils
from sysinv.openstack.common import log as logging
@ -57,7 +56,6 @@ class CeilometerHelm(openstack.OpenstackBaseHelm):
def _get_conf_overrides(self):
return {
'ceilometer': {
'DEFAULT': self._get_conf_ceilometer_default_overrides(),
'notification': {
'messaging_urls': {
'values': self._get_notification_messaging_urls()
@ -69,34 +67,6 @@ class CeilometerHelm(openstack.OpenstackBaseHelm):
}
}
def _get_conf_ceilometer_default_overrides(self):
default_overrides = {
'region_name_for_services': self._get_service_region_name(self.SERVICE_NAME)
}
if self._region_config():
region_1_name = self._get_service_region_name(constants.SERVICE_TYPE_KEYSTONE)
shared_services_types = self._get_shared_services_types()
default_overrides.update(
{'region_name_for_shared_services': region_1_name,
'shared_services_types': shared_services_types})
return default_overrides
def _get_shared_services_types(self):
shared_services_types = []
shared_services = self._get_shared_services()
if constants.SERVICE_TYPE_IMAGE in shared_services:
shared_services_types += [constants.SERVICE_TYPE_IMAGE]
if constants.SERVICE_TYPE_VOLUME in shared_services:
shared_services_types += [constants.SERVICE_TYPE_VOLUME,
constants.SERVICE_TYPE_VOLUME + 'v2',
constants.SERVICE_TYPE_VOLUME + 'v3']
return shared_services_types
def _get_notification_messaging_urls(self):
rabbit_user = 'rabbitmq-admin'
rabbit_pass = self._get_common_password(rabbit_user)

2
sysinv/sysinv/sysinv/sysinv/helm/openstack.py
View File

@ -117,7 +117,7 @@ class OpenstackBaseHelm(base.BaseHelm):
service_config = self._get_service_config(service)
if (service_config is not None and
service_config.region_name is not None):
return service_config.region_name
return service_config.region_name.encode('utf8', 'strict')
if (self._distributed_cloud_role() ==
constants.DISTRIBUTED_CLOUD_ROLE_SYSTEMCONTROLLER and