Merge "Introduce support for ceilometer chart overrides"

sysinv/sysinv/sysinv/sysinv/helm/base.py

@@ -106,6 +106,13 @@ class BaseHelm(object):
             return None
         return service
 
+    def _get_shared_services(self):
+        if self.dbapi is None:
+            return []
+
+        system = self._get_system()
+        return system.capabilities.get('shared_services', [])
+
     def _get_service_parameter(self, service, section, name):
         if self.dbapi is None:
             return None

sysinv/sysinv/sysinv/sysinv/helm/ceilometer.py

@@ -0,0 +1,151 @@
+#
+# Copyright (c) 2018 Wind River Systems, Inc.
+#
+# 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
+from . import common
+from . import openstack
+
+LOG = logging.getLogger(__name__)
+
+
+class CeilometerHelm(openstack.OpenstackBaseHelm):
+    """Class to encapsulate helm operations for the ceilometer chart"""
+
+    CHART = constants.HELM_CHART_CEILOMETER
+    SUPPORTED_NAMESPACES = [
+        common.HELM_NS_OPENSTACK
+    ]
+
+    SERVICE_NAME = 'ceilometer'
+    AUTH_USERS = ['ceilometer']
+
+    @property
+    def docker_repo_source(self):
+        return common.DOCKER_SRC_STX
+
+    def get_namespaces(self):
+        return self.SUPPORTED_NAMESPACES
+
+    def get_overrides(self, namespace=None):
+        overrides = {
+            common.HELM_NS_OPENSTACK: {
+                'images': self._get_images_overrides(),
+                'pod': self._get_pod_overrides(),
+                'conf': self._get_conf_overrides(),
+                'manifests': self._get_manifests_overrides(),
+                'endpoints': self._get_endpoints_overrides(),
+            }
+        }
+
+        if namespace in self.SUPPORTED_NAMESPACES:
+            return overrides[namespace]
+        elif namespace:
+            raise exception.InvalidHelmNamespace(chart=self.CHART,
+                                                 namespace=namespace)
+        else:
+            return overrides
+
+    def _get_images_overrides(self):
+        heat_image = self._operator.chart_operators[
+            constants.HELM_CHART_HEAT].docker_image
+        return {
+            'tags': {
+                'ks_service': heat_image,
+                'ks_user': heat_image,
+                'ceilometer_db_sync': self.docker_image,
+                'ceilometer_central': self.docker_image,
+                'ceilometer_compute': self.docker_image,
+                'ceilometer_ipmi': self.docker_image,
+                'ceilometer_notification': self.docker_image
+            }
+        }
+
+    def _get_pod_overrides(self):
+        return {
+            'replicas': {
+                'central': self._num_controllers()
+            }
+        }
+
+    def _get_manifests_overrides(self):
+        manifests_overrides = {}
+        if utils.is_virtual():
+            manifests_overrides.update({'daemonset_ipmi': False})
+        return manifests_overrides
+
+    def _get_conf_overrides(self):
+        return {
+            'ceilometer': {
+                'DEFAULT': self._get_conf_ceilometer_default_overrides(),
+                'notification': self._get_conf_ceilometer_notification_overrides()
+            }
+        }
+
+    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_conf_ceilometer_notification_overrides(self):
+        notification_overrides = {
+            'batch_size': 100
+        }
+
+        system = self._get_system()
+        if system.system_type == constants.TIS_AIO_BUILD:
+            batch_timeout = 25
+        else:
+            batch_timeout = 5
+
+        notification_overrides.update({'batch_timeout': batch_timeout})
+        return notification_overrides
+
+    def _get_endpoints_identity_users_overrides(self):
+        overrides = {}
+        overrides.update(self._get_common_users_overrides(self.SERVICE_NAME))
+
+        for user in self.AUTH_USERS:
+            overrides.update({
+                user: {
+                    'region_name': self._region_name(),
+                    'password': self._get_keyring_password(self.SERVICE_NAME, user)
+                }
+            })
+        return overrides
+
+    def _get_endpoints_identity_overrides(self):
+        return {'auth': self._get_endpoints_identity_users_overrides()}
+
+    def _get_endpoints_overrides(self):
+        return {
+            'identity': self._get_endpoints_identity_overrides()
+        }

sysinv/sysinv/sysinv/sysinv/helm/helm.py

@@ -22,6 +22,7 @@ from . import common
 # Import Chart Override Helpers:
 # Chart source: https://github.com/openstack/openstack-helm.git
 from . import barbican
+from . import ceilometer
 from . import cinder
 from . import glance
 from . import gnocchi
@@ -86,6 +87,7 @@ class HelmOperator(object):
         # register chart operators for lookup
         self.chart_operators = {
             constants.HELM_CHART_BARBICAN: barbican.BarbicanHelm(self),
+            constants.HELM_CHART_CEILOMETER: ceilometer.CeilometerHelm(self),
             constants.HELM_CHART_CINDER: cinder.CinderHelm(self),
             constants.HELM_CHART_GLANCE: glance.GlanceHelm(self),
             constants.HELM_CHART_GNOCCHI: gnocchi.GnocchiHelm(self),

sysinv/sysinv/sysinv/sysinv/helm/openstack.py

@@ -66,6 +66,20 @@ class OpenstackBaseHelm(base.BaseHelm):
         # we generated the password originally.
         return password.encode('utf8', 'strict')
 
+    def _get_service_region_name(self, service):
+        if self._region_config():
+            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
+
+        if (self._distributed_cloud_role() ==
+                constants.DISTRIBUTED_CLOUD_ROLE_SYSTEMCONTROLLER and
+                service in self.SYSTEM_CONTROLLER_SERVICES):
+            return constants.SYSTEM_CONTROLLER_REGION
+
+        return self._region_name()
+
     def _get_common_users_overrides(self, service):
         overrides = {}
         for user in common.USERS: