Merge lp:~gnuoy/charms/trusty/nova-compute/1515570 into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

[Liam Young]

[Matt Dupre (matthew-dupre)]

Code change looks good to me.

Ashley tested this along with the associated change to our charm to make use of the new setting, and it worked. Would be great to get this merged in.

Thanks,
Matt

review: Approve

[Matt Dupre (matthew-dupre)]

Liam - just chasing up on this one. Is there anything I can do to get this merged in?

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

charm_lint_check #17336 nova-compute-next for gnuoy mp277556
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/17336/

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

charm_unit_test #16196 nova-compute-next for gnuoy mp277556
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/16196/

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

charm_amulet_test #8793 nova-compute-next for gnuoy mp277556
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/8793/

[James Page (james-page)]

review: Approve

=== modified file 'hooks/nova_compute_hooks.py'
--- hooks/nova_compute_hooks.py	2015-10-14 14:17:49 +0000
+++ hooks/nova_compute_hooks.py	2015-11-16 11:54:16 +0000
@@ -19,7 +19,9 @@
     restart_on_change,
     service_restart,
 )
-
+from charmhelpers.core.strutils import (
+    bool_from_string,
+)
 from charmhelpers.fetch import (
     apt_install,
     apt_purge,
@@ -384,9 +386,14 @@
 @restart_on_change(restart_map())
 def neutron_plugin_changed():
     settings = relation_get()
-    if 'metadata-shared-secret' in settings:
+    if settings.get('enable-metadata'):
+        enable_metadata = bool_from_string(settings['enable-metadata'])
+    else:
+        enable_metadata = False
+    if 'metadata-shared-secret' in settings or enable_metadata:
         apt_update()
-        apt_install('nova-api-metadata', fatal=True)
+        apt_install(filter_installed_packages(['nova-api-metadata']),
+                    fatal=True)
     else:
         apt_purge('nova-api-metadata', fatal=True)
     CONFIGS.write(NOVA_CONF)
 
=== modified file 'unit_tests/test_nova_compute_hooks.py'
--- unit_tests/test_nova_compute_hooks.py	2015-10-06 16:58:22 +0000
+++ unit_tests/test_nova_compute_hooks.py	2015-11-16 11:54:16 +0000
@@ -25,6 +25,7 @@
     'unit_get',
     # charmhelpers.core.host
     'apt_install',
+    'apt_purge',
     'apt_update',
     'filter_installed_packages',
     'restart_on_change',
@@ -484,5 +485,30 @@
                                           'sharedsecret'}
         hooks.neutron_plugin_changed()
         self.assertTrue(self.apt_update.called)
-        self.apt_install.assert_called_with('nova-api-metadata', fatal=True)
+        self.apt_install.assert_called_with(['nova-api-metadata'],
+                                            fatal=True)
+        configs.write.assert_called_with('/etc/nova/nova.conf')
+
+    @patch.object(hooks, 'CONFIGS')
+    def test_neutron_plugin_changed_nometa_implicit(self, configs):
+        self.relation_get.return_value = {}
+        hooks.neutron_plugin_changed()
+        self.apt_purge.assert_called_with('nova-api-metadata',
+                                          fatal=True)
+        configs.write.assert_called_with('/etc/nova/nova.conf')
+
+    @patch.object(hooks, 'CONFIGS')
+    def test_neutron_plugin_changed_meta(self, configs):
+        self.relation_get.return_value = {'enable-metadata': 'True'}
+        hooks.neutron_plugin_changed()
+        self.apt_install.assert_called_with(['nova-api-metadata'],
+                                            fatal=True)
+        configs.write.assert_called_with('/etc/nova/nova.conf')
+
+    @patch.object(hooks, 'CONFIGS')
+    def test_neutron_plugin_changed_nometa_explicit(self, configs):
+        self.relation_get.return_value = {'enable-metadata': 'false'}
+        hooks.neutron_plugin_changed()
+        self.apt_purge.assert_called_with('nova-api-metadata',
+                                          fatal=True)
         configs.write.assert_called_with('/etc/nova/nova.conf')