Merge lp:~hopem/charms/trusty/nova-compute/lp1489463 into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

[Edward Hope-Morley]

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #139 nova-compute-next for hopem mp285486
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/139/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #131 nova-compute-next for hopem mp285486
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/131/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #26 nova-compute-next for hopem mp285486
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 124
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/15004581/
Build: http://10.245.162.36:8080/job/charm_amulet_test/26/

[Ryan Beisner (1chb1n)]

^ FYI, an undercloud network issue occurred as this test was being executed. I've retriggered.

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #28 nova-compute-next for hopem mp285486
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/28/

[Liam Young (gnuoy)]

Approved

review: Approve

=== modified file 'hooks/nova_compute_hooks.py'
--- hooks/nova_compute_hooks.py	2016-01-15 14:13:25 +0000
+++ hooks/nova_compute_hooks.py	2016-02-09 15:55:50 +0000
@@ -8,6 +8,7 @@
     log,
     ERROR,
     relation_ids,
+    related_units,
     relation_get,
     relation_set,
     service_name,
@@ -161,6 +162,12 @@
     if config('hugepages'):
         install_hugepages()
 
+    if (config('libvirt-image-backend') == 'rbd' and
+            assert_libvirt_imagebackend_allowed()):
+        for rid in relation_ids('ceph'):
+            for unit in related_units(rid):
+                ceph_changed(rid=rid, unit=unit)
+
     CONFIGS.write_all()
 
 
@@ -291,7 +298,7 @@
 
 @hooks.hook('ceph-relation-changed')
 @restart_on_change(restart_map())
-def ceph_changed():
+def ceph_changed(rid=None, unit=None):
     if 'ceph' not in CONFIGS.complete_contexts():
         log('ceph relation incomplete. Peer not ready?')
         return
@@ -307,10 +314,10 @@
 
     # With some refactoring, this can move into NovaComputeCephContext
     # and allow easily extended to support other compute flavors.
-    if config('virt-type') in ['kvm', 'qemu', 'lxc'] and relation_get('key'):
+    key = relation_get(attribute='key', rid=rid, unit=unit)
+    if config('virt-type') in ['kvm', 'qemu', 'lxc'] and key:
         create_libvirt_secret(secret_file=CEPH_SECRET,
-                              secret_uuid=CEPH_SECRET_UUID,
-                              key=relation_get('key'))
+                              secret_uuid=CEPH_SECRET_UUID, key=key)
 
     if (config('libvirt-image-backend') == 'rbd' and
             assert_libvirt_imagebackend_allowed()):

=== modified file 'templates/kilo/nova.conf'
--- templates/kilo/nova.conf	2015-11-04 16:06:18 +0000
+++ templates/kilo/nova.conf	2016-02-09 15:55:50 +0000
@@ -147,7 +147,7 @@
 keymap = {{ console_keymap }}
 server_listen = 0.0.0.0
 server_proxyclient_address = {{ console_listen_addr }}
-{% endif -%}
+{% endif %}
 
 [libvirt]
 {% if cpu_mode -%}
@@ -156,25 +156,22 @@
 {% if cpu_model -%}
 cpu_model = {{ cpu_model }}
 {% endif -%}
-{% if libvirt_images_type -%}
+{% if libvirt_images_type and rbd_pool -%}
 images_type = {{ libvirt_images_type }}
 images_rbd_pool = {{ rbd_pool }}
 images_rbd_ceph_conf = {{ libvirt_rbd_images_ceph_conf }}
-inject_password=false
-inject_key=false
-inject_partition=-2
+inject_password = false
+inject_key = false
+inject_partition = -2
 {% endif -%}
-{% if rbd_pool -%}
-rbd_pool = {{ rbd_pool }}
 rbd_user = {{ rbd_user }}
 rbd_secret_uuid = {{ rbd_secret_uuid }}
-{% endif -%}
 {% if live_migration_uri -%}
 live_migration_uri = {{ live_migration_uri }}
 {% endif -%}
 {% if disk_cachemodes -%}
 disk_cachemodes = {{ disk_cachemodes }}
-{% endif -%}
+{% endif %}
 
 {% include "parts/section-database" %}