Merge lp:~openstack-charmers/charms/precise/nova-compute/ceilometer-agent into lp:~charmers/charms/precise/nova-compute/trunk

[James Page]

Add subordinate interface to allow ceilometer-agent charm to pass
configuration to nova.

[Adam Gandelman (gandelman-a)]

Looks like a simple but useful change. Will wait till the ceilometer agent/server charms officially hit the store before merging this.

review: Approve

[Marco Ceppi (marcoceppi)]

review: Abstain

=== added symlink 'hooks/nova-ceilometer-relation-changed'
=== target is u'nova_compute_hooks.py'
=== added symlink 'hooks/nova-ceilometer-relation-joined'
=== target is u'nova_compute_hooks.py'
=== modified file 'hooks/nova_compute_hooks.py'
--- hooks/nova_compute_hooks.py	2013-11-08 05:48:58 +0000
+++ hooks/nova_compute_hooks.py	2013-12-04 16:30:15 +0000
@@ -209,6 +209,12 @@
         amqp_joined(relation_id=r_id)
 
 
[e-mail]('nova-ceilometer-relation-changed')
+@restart_on_change(restart_map())
+def nova_ceilometer_relation_changed():
+    CONFIGS.write_all()
+
+
 def main():
     try:
         hooks.execute(sys.argv)
 
=== modified file 'hooks/nova_compute_utils.py'
--- hooks/nova_compute_utils.py	2013-11-01 16:11:43 +0000
+++ hooks/nova_compute_utils.py	2013-12-04 16:30:15 +0000
@@ -69,7 +69,12 @@
                      context.OSConfigFlagContext(),
                      CloudComputeContext(),
                      NovaComputeLibvirtContext(),
-                     NovaComputeCephContext()],
+                     NovaComputeCephContext(),
+                     context.SubordinateConfigContext(
+                         interface='nova-ceilometer',
+                         service='nova',
+                         config_file=NOVA_CONF,
+                     )],
     },
 }
 
 
=== modified file 'metadata.yaml'
--- metadata.yaml	2013-08-01 23:21:58 +0000
+++ metadata.yaml	2013-12-04 16:30:15 +0000
@@ -6,7 +6,7 @@
  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 @@
   nrpe-external-master:
     interface: nrpe-external-master
     scope: container
+  nova-ceilometer:
+    interface: nova-ceilometer
+    scope: container
 peers:
   compute-peer:
     interface: nova
 
=== modified file 'templates/havana/nova.conf'
--- templates/havana/nova.conf	2013-11-01 22:05:27 +0000
+++ templates/havana/nova.conf	2013-12-04 16:30:15 +0000
@@ -84,3 +84,9 @@
 {% 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 -%}
 \ No newline at end of file