Merge lp:~corey.bryant/charms/trusty/ceilometer/aodh-conf into lp:~openstack-charmers-archive/charms/trusty/ceilometer/next

[Corey Bryant]

[lp:~corey.bryant/charms/trusty/ceilometer/aodh-conf]

114. By Corey Bryant on 2016-01-19

Add ceilomter.conf template support and adjust aodh.conf template

115. By Corey Bryant on 2016-01-19

Update comment in template files to mitaka

116. By Corey Bryant on 2016-01-19

Update aodh context and separate from ceilometer context

Unmerged revisions

116. By Corey Bryant on 2016-01-19

Update aodh context and separate from ceilometer context

115. By Corey Bryant on 2016-01-19

Update comment in template files to mitaka

114. By Corey Bryant on 2016-01-19

Add ceilomter.conf template support and adjust aodh.conf template

113. By Corey Bryant on 2016-01-14

Add aodh.conf template support

=== modified file 'lib/ceilometer_contexts.py'
--- lib/ceilometer_contexts.py	2015-10-16 12:29:41 +0000
+++ lib/ceilometer_contexts.py	2016-01-19 18:54:49 +0000
@@ -19,6 +19,7 @@
 )
 
 CEILOMETER_DB = 'ceilometer'
+AODH_DB = 'aodh'
 
 
 class LoggingConfigContext(OSContextGenerator):
@@ -26,13 +27,13 @@
         return {'debug': config('debug'), 'verbose': config('verbose')}
 
 
-class MongoDBContext(OSContextGenerator):
+class MongoDBContextCeilometer(OSContextGenerator):
     interfaces = ['mongodb']
 
     def __call__(self):
         mongo_servers = []
         replset = None
-        use_replset = os_release('ceilometer-api') >= 'icehouse'
+        use_replset = True
 
         for relid in relation_ids('shared-db'):
             rel_units = related_units(relid)
@@ -69,7 +70,51 @@
         return {}
 
 
+class MongoDBContextAodh(OSContextGenerator):
+    interfaces = ['mongodb']
+
+    def __call__(self):
+        mongo_servers = []
+        replset = None
+        use_replset = os_release('aodh-api') >= 'icehouse'
+
+        for relid in relation_ids('shared-db'):
+            rel_units = related_units(relid)
+            use_replset = use_replset and (len(rel_units) > 1)
+
+            for unit in rel_units:
+                host = relation_get('hostname', unit, relid)
+                port = relation_get('port', unit, relid)
+
+                conf = {
+                    "db_host": host,
+                    "db_port": port,
+                    "db_name": AODH_DB
+                }
+
+                if not context_complete(conf):
+                    continue
+
+                if not use_replset:
+                    return conf
+
+                if replset is None:
+                    replset = relation_get('replset', unit, relid)
+
+                mongo_servers.append('{}:{}'.format(host, port))
+
+        if mongo_servers:
+            return {
+                'db_mongo_servers': ','.join(mongo_servers),
+                'db_name': AODH_DB,
+                'db_replset': replset
+            }
+
+        return {}
+
+
 CEILOMETER_PORT = 8777
+AODH_PORT = 8042
 
 
 class CeilometerContext(OSContextGenerator):
@@ -85,6 +130,19 @@
         return ctxt
 
 
+class AodhContext(OSContextGenerator):
+    def __call__(self):
+        # Lazy-import to avoid a circular dependency in the imports
+        from ceilometer_utils import get_shared_secret
+
+        ctxt = {
+            'api_workers': config('api-workers'),
+            'port': AODH_PORT,
+            'metering_secret': get_shared_secret()
+        }
+        return ctxt
+
+
 class CeilometerServiceContext(OSContextGenerator):
     interfaces = ['ceilometer-service']
 
 
=== modified file 'lib/ceilometer_utils.py'
--- lib/ceilometer_utils.py	2016-01-06 14:59:34 +0000
+++ lib/ceilometer_utils.py	2016-01-19 18:54:49 +0000
@@ -10,8 +10,10 @@
 from ceilometer_contexts import (
     ApacheSSLContext,
     LoggingConfigContext,
-    MongoDBContext,
+    MongoDBContextCeilometer,
+    MongoDBContextAodh,
     CeilometerContext,
+    AodhContext,
     HAProxyContext
 )
 from charmhelpers.contrib.openstack.utils import (
@@ -28,6 +30,8 @@
 HAPROXY_CONF = '/etc/haproxy/haproxy.cfg'
 CEILOMETER_CONF_DIR = "/etc/ceilometer"
 CEILOMETER_CONF = "%s/ceilometer.conf" % CEILOMETER_CONF_DIR
+AODH_CONF_DIR = "/etc/aodh"
+AODH_CONF = "%s/aodh.conf" % AODH_CONF_DIR
 HTTPS_APACHE_CONF = "/etc/apache2/sites-available/openstack_https_frontend"
 HTTPS_APACHE_24_CONF = "/etc/apache2/sites-available/" \
     "openstack_https_frontend.conf"
@@ -40,16 +44,15 @@
     'ceilometer-agent-notification',
 ]
 
-ICEHOUSE_SERVICES = [
+CEILOMETER_ICEHOUSE_SERVICES = [
     'ceilometer-alarm-notifier',
     'ceilometer-alarm-evaluator',
-    'ceilometer-agent-notification'
 ]
 
-MITAKA_SERVICES = [
+# aodh is used in >= mitaka
+AODH_SERVICES = [
     'aodh-notifier',
     'aodh-evaluator',
-    'ceilometer-agent-notification'
 ]
 
 CEILOMETER_DB = "ceilometer"
@@ -64,16 +67,20 @@
     'python-pymongo',
 ]
 
-ICEHOUSE_PACKAGES = [
+CEILOMETER_ICEHOUSE_PACKAGES = [
     'ceilometer-alarm-notifier',
     'ceilometer-alarm-evaluator',
-    'ceilometer-agent-notification'
-]
-
-MITAKA_PACKAGES = [
+    'ceilometer-agent-notification',
+]
+
+CEILOMETER_MITAKA_PACKAGES = [
+    'ceilometer-agent-notification',
+]
+
+# aodh is used in >= mitaka
+AODH_PACKAGES = [
     'aodh-notifier',
     'aodh-evaluator',
-    'ceilometer-agent-notification'
 ]
 
 REQUIRED_INTERFACES = {
@@ -91,12 +98,23 @@
                                                          service_user=SVC),
                           context.AMQPContext(ssl_dir=CEILOMETER_CONF_DIR),
                           LoggingConfigContext(),
-                          MongoDBContext(),
+                          MongoDBContextCeilometer(),
                           CeilometerContext(),
                           context.SyslogContext(),
                           HAProxyContext()],
         'services': CEILOMETER_BASE_SERVICES
     }),
+    (AODH_CONF, {
+        'hook_contexts': [context.IdentityServiceContext(service=SVC,
+                                                         service_user=SVC),
+                          context.AMQPContext(ssl_dir=AODH_CONF_DIR),
+                          LoggingConfigContext(),
+                          MongoDBContextAodh(),
+                          AodhContext(),
+                          context.SyslogContext(),
+                          HAProxyContext()],
+        'services': AODH_SERVICES
+    }),
     (HAPROXY_CONF, {
         'hook_contexts': [context.HAProxyContext(singlenode_mode=True),
                           HAProxyContext()],
@@ -216,9 +234,9 @@
 def ceilometer_release_services():
     codename = get_os_codename_install_source(config('openstack-origin'))
     if codename >= 'mitaka':
-        return MITAKA_SERVICES
+        return []
     elif codename >= 'icehouse':
-        return ICEHOUSE_SERVICES
+        return CEILOMETER_ICEHOUSE_SERVICES
     else:
         return []
 
@@ -226,16 +244,25 @@
 def ceilometer_release_packages():
     codename = get_os_codename_install_source(config('openstack-origin'))
     if codename >= 'mitaka':
-        return MITAKA_PACKAGES
+        return CEILOMETER_MITAKA_PACKAGES
     elif codename >= 'icehouse':
-        return ICEHOUSE_PACKAGES
+        return CEILOMETER_ICEHOUSE_PACKAGES
+    else:
+        return []
+
+
+def aodh_release_packages():
+    codename = get_os_codename_install_source(config('openstack-origin'))
+    if codename >= 'mitaka':
+        return AODH_PACKAGES
     else:
         return []
 
 
 def get_packages():
     packages = (deepcopy(CEILOMETER_BASE_PACKAGES) +
-                ceilometer_release_packages())
+                ceilometer_release_packages() +
+                aodh_release_packages())
     return packages
 
 
 
=== added directory 'templates/mitaka'
=== added file 'templates/mitaka/aodh.conf'
--- templates/mitaka/aodh.conf	1970-01-01 00:00:00 +0000
+++ templates/mitaka/aodh.conf	2016-01-19 18:54:49 +0000
@@ -0,0 +1,44 @@
+# mitaka
+###############################################################################
+# [ WARNING ]
+# aodh configuration file maintained by Juju
+# local changes may be overwritten.
+###############################################################################
+[DEFAULT]
+debug = {{ debug }}
+verbose = {{ verbose }}
+use_syslog = {{ use_syslog }}
+
+[oslo_messaging_rabbit]
+{% include "parts/rabbitmq" -%}
+
+[api]
+port = {{ port }}
+workers = {{ api_workers }}
+
+[service_credentials]
+os_auth_url = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/v2.0
+os_tenant_name = {{ admin_tenant_name }}
+os_username = {{ admin_user }}
+os_password = {{ admin_password }}
+
+[database]
+{% if db_replset: -%}
+connection = mongodb://{{ db_mongo_servers }}/{{ db_name }}?readPreference=primaryPreferred&replicaSet={{ db_replset }}
+mongodb_replica_set = {{ db_replset }}
+{% else -%}
+connection = mongodb://{{ db_host }}:{{ db_port }}/{{ db_name }}
+{% endif %}
+
+[publisher_rpc]
+metering_secret = {{ metering_secret }}
+
+[keystone_authtoken]
+auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/
+auth_host = {{ auth_host }}
+auth_port = {{ auth_port }}
+auth_protocol = {{ auth_protocol }}
+admin_tenant_name = {{ admin_tenant_name }}
+admin_user = {{ admin_user }}
+admin_password = {{ admin_password }}
+signing_dir = {{ signing_dir }}
 
=== added file 'templates/mitaka/ceilometer.conf'
--- templates/mitaka/ceilometer.conf	1970-01-01 00:00:00 +0000
+++ templates/mitaka/ceilometer.conf	2016-01-19 18:54:49 +0000
@@ -0,0 +1,44 @@
+# mitaka
+###############################################################################
+# [ WARNING ]
+# ceilometer configuration file maintained by Juju
+# local changes may be overwritten.
+###############################################################################
+[DEFAULT]
+debug = {{ debug }}
+verbose = {{ verbose }}
+use_syslog = {{ use_syslog }}
+
+[oslo_messaging_rabbit]
+{% include "parts/rabbitmq" -%}
+
+[api]
+port = {{ port }}
+workers = {{ api_workers }}
+
+[service_credentials]
+os_auth_url = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/v2.0
+os_tenant_name = {{ admin_tenant_name }}
+os_username = {{ admin_user }}
+os_password = {{ admin_password }}
+
+[database]
+{% if db_replset: -%}
+connection = mongodb://{{ db_mongo_servers }}/{{ db_name }}?readPreference=primaryPreferred&replicaSet={{ db_replset }}
+mongodb_replica_set = {{ db_replset }}
+{% else -%}
+connection = mongodb://{{ db_host }}:{{ db_port }}/{{ db_name }}
+{% endif %}
+
+[publisher_rpc]
+metering_secret = {{ metering_secret }}
+
+[keystone_authtoken]
+auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/
+auth_host = {{ auth_host }}
+auth_port = {{ auth_port }}
+auth_protocol = {{ auth_protocol }}
+admin_tenant_name = {{ admin_tenant_name }}
+admin_user = {{ admin_user }}
+admin_password = {{ admin_password }}
+signing_dir = {{ signing_dir }}