Add new locally scoped relation and context updates for nova-ceilometer

hooks/nova-ceilometer-relation-changed

@@ -0,0 +1 @@
+nova_compute_hooks.py

hooks/nova-ceilometer-relation-joined

@@ -0,0 +1 @@
+nova_compute_hooks.py

hooks/nova_compute_hooks.py

@@ -209,6 +209,12 @@ def upgrade_charm():
         amqp_joined(relation_id=r_id)
 
 
+@hooks.hook('nova-ceilometer-relation-changed')
+@restart_on_change(restart_map())
+def nova_ceilometer_relation_changed():
+    CONFIGS.writeall()
+
+
 def main():
     try:
         hooks.execute(sys.argv)

hooks/nova_compute_utils.py

@@ -69,7 +69,12 @@ BASE_RESOURCE_MAP = {
                      context.OSConfigFlagContext(),
                      CloudComputeContext(),
                      NovaComputeLibvirtContext(),
-                     NovaComputeCephContext()],
+                     NovaComputeCephContext(),
+                     context.SubordinateConfigContext(
+                         interface='nova-ceilometer',
+                         service='nova',
+                         config_file=NOVA_CONF,
+                     )],
     },
 }
 

metadata.yaml

@@ -6,7 +6,7 @@ description: |
  addition to its "native" API (the OpenStack API), it also supports the Amazon
  EC2 API.
 categories:
-    - openstack
+  - openstack
 provides:
   cloud-compute:
     interface: nova-compute
@@ -22,6 +22,9 @@ requires:
   nrpe-external-master:
     interface: nrpe-external-master
     scope: container
+  nova-ceilometer:
+    interface: nova-ceilometer
+    scope: container
 peers:
   compute-peer:
     interface: nova

templates/havana/nova.conf

@@ -84,3 +84,9 @@ volume_api_class = nova.volume.cinder.API
 {% if live_migration_uri -%}
 live_migration_uri = {{ live_migration_uri }}
 {% endif -%}
+
+{% if sections and 'DEFAULT' in sections -%}
+{% for key, value in sections['DEFAULT'] -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif -%}