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

[Liam Young]

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

charm_lint_check #2919 nova-compute-next for gnuoy mp254423
    LINT OK: passed

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

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

charm_unit_test #2710 nova-compute-next for gnuoy mp254423
    UNIT OK: passed

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

=== modified file 'hooks/nova_compute_context.py'
--- hooks/nova_compute_context.py	2015-03-12 10:07:02 +0000
+++ hooks/nova_compute_context.py	2015-03-27 16:21:32 +0000
@@ -390,6 +390,19 @@
         return ctxt
 
 
+class MetadataServiceContext(context.OSContextGenerator):
+
+    def __call__(self):
+        ctxt = {}
+        for rid in relation_ids('neutron-plugin'):
+            for unit in related_units(rid):
+                rdata = relation_get(rid=rid, unit=unit)
+                if 'metadata-shared-secret' in rdata:
+                    ctxt['metadata_shared_secret'] = \
+                        rdata['metadata-shared-secret']
+        return ctxt
+
+
 class NeutronComputeContext(context.NeutronContext):
     interfaces = []
 
 
=== modified file 'hooks/nova_compute_hooks.py'
--- hooks/nova_compute_hooks.py	2015-02-24 11:33:01 +0000
+++ hooks/nova_compute_hooks.py	2015-03-27 16:21:32 +0000
@@ -21,6 +21,7 @@
 
 from charmhelpers.fetch import (
     apt_install,
+    apt_purge,
     apt_update,
     filter_installed_packages,
 )
@@ -324,6 +325,18 @@
     nrpe_setup.write()
 
 
[e-mail]('neutron-plugin-relation-changed')
+@restart_on_change(restart_map())
+def neutron_plugin_changed():
+    settings = relation_get()
+    if 'metadata-shared-secret' in settings:
+        apt_update()
+        apt_install('nova-api-metadata', fatal=True)
+    else:
+        apt_purge('nova-api-metadata', fatal=True)
+    CONFIGS.write(NOVA_CONF)
+
+
 def main():
     try:
         hooks.execute(sys.argv)
 
=== modified file 'hooks/nova_compute_utils.py'
--- hooks/nova_compute_utils.py	2015-03-12 10:07:02 +0000
+++ hooks/nova_compute_utils.py	2015-03-27 16:21:32 +0000
@@ -39,6 +39,7 @@
 
 from nova_compute_context import (
     CloudComputeContext,
+    MetadataServiceContext,
     NovaComputeLibvirtContext,
     NovaComputeCephContext,
     NeutronComputeContext,
@@ -94,6 +95,7 @@
                          service='nova',
                          config_file=NOVA_CONF),
                      InstanceConsoleContext(),
+                     MetadataServiceContext(),
                      HostIPContext()],
     },
 }
@@ -203,6 +205,8 @@
         }
         resource_map.update(CEPH_RESOURCES)
 
+    if enable_nova_metadata():
+        resource_map[NOVA_CONF]['services'].append('nova-api-metadata')
     return resource_map
 
 
@@ -271,6 +275,8 @@
     except KeyError:
         log('Unsupported virt-type configured: %s' % virt_type)
         raise
+    if enable_nova_metadata():
+        packages.append('nova-api-metadata')
 
     return packages
 
@@ -488,3 +494,8 @@
     if lsb_release()['DISTRIB_CODENAME'].lower() < "trusty":
         raise Exception("IPv6 is not supported in the charms for Ubuntu "
                         "versions less than Trusty 14.04")
+
+
+def enable_nova_metadata():
+    ctxt = MetadataServiceContext()()
+    return 'metadata_shared_secret' in ctxt
 
=== modified file 'templates/juno/nova.conf'
--- templates/juno/nova.conf	2014-12-15 10:28:47 +0000
+++ templates/juno/nova.conf	2015-03-27 16:21:32 +0000
@@ -31,6 +31,11 @@
 glance_api_servers = {{ glance_api_servers }}
 {% endif -%}
 
+{% if metadata_shared_secret -%}
+neutron_metadata_proxy_shared_secret = {{ metadata_shared_secret }}
+service_neutron_metadata_proxy=True
+{% endif -%}
+
 {% if console_vnc_type -%}
 vnc_enabled = True
 novnc_enabled = True
 
=== modified file 'unit_tests/test_nova_compute_contexts.py'
--- unit_tests/test_nova_compute_contexts.py	2015-02-16 09:53:45 +0000
+++ unit_tests/test_nova_compute_contexts.py	2015-03-27 16:21:32 +0000
@@ -228,3 +228,11 @@
         self.assertEquals(
             {'host_ip': '172.24.0.79'}, host_ip())
         self.unit_get.assert_called_with('private-address')
+
+    def test_metadata_service_ctxt(self):
+        self.relation_ids.return_value = 'neutron-plugin:0'
+        self.related_units.return_value = 'neutron-openvswitch/0'
+        self.test_relation.set({'metadata-shared-secret': 'shared_secret'})
+        metadatactxt = context.MetadataServiceContext()
+        self.assertEqual(metadatactxt(), {'metadata_shared_secret':
+                                          'shared_secret'})
 
=== modified file 'unit_tests/test_nova_compute_hooks.py'
--- unit_tests/test_nova_compute_hooks.py	2015-02-09 21:30:33 +0000
+++ unit_tests/test_nova_compute_hooks.py	2015-03-27 16:21:32 +0000
@@ -378,3 +378,12 @@
             call('/etc/nova/nova.conf'),
         ]
         self.assertEquals(ex, configs.write.call_args_list)
+
+    @patch.object(hooks, 'CONFIGS')
+    def test_neutron_plugin_changed(self, configs):
+        self.relation_get.return_value = {'metadata-shared-secret':
+                                          'sharedsecret'}
+        hooks.neutron_plugin_changed()
+        self.assertTrue(self.apt_update.called)
+        self.apt_install.assert_called_with('nova-api-metadata', fatal=True)
+        configs.write.assert_called_with('/etc/nova/nova.conf')
 
=== modified file 'unit_tests/test_nova_compute_utils.py'
--- unit_tests/test_nova_compute_utils.py	2015-02-06 18:09:18 +0000
+++ unit_tests/test_nova_compute_utils.py	2015-03-27 16:21:32 +0000
@@ -24,7 +24,8 @@
     'relation_ids',
     'relation_get',
     'mkdir',
-    'install_alternative'
+    'install_alternative',
+    'MetadataServiceContext',
 ]
 
 OVS_PKGS = [
@@ -41,8 +42,10 @@
         super(NovaComputeUtilsTests, self).setUp(utils, TO_PATCH)
         self.config.side_effect = self.test_config.get
 
+    @patch.object(utils, 'enable_nova_metadata')
     @patch.object(utils, 'network_manager')
-    def test_determine_packages_nova_network(self, net_man):
+    def test_determine_packages_nova_network(self, net_man, en_meta):
+        en_meta.return_value = False
         net_man.return_value = 'flatdhcpmanager'
         self.relation_ids.return_value = []
         result = utils.determine_packages()
@@ -53,9 +56,11 @@
         ]
         self.assertEquals(ex, result)
 
+    @patch.object(utils, 'enable_nova_metadata')
     @patch.object(utils, 'neutron_plugin')
     @patch.object(utils, 'network_manager')
-    def test_determine_packages_quantum(self, net_man, n_plugin):
+    def test_determine_packages_quantum(self, net_man, n_plugin, en_meta):
+        en_meta.return_value = False
         self.neutron_plugin_attribute.return_value = OVS_PKGS
         net_man.return_value = 'quantum'
         n_plugin.return_value = 'ovs'
@@ -64,9 +69,11 @@
         ex = utils.BASE_PACKAGES + OVS_PKGS_FLAT + ['nova-compute-kvm']
         self.assertEquals(ex, result)
 
+    @patch.object(utils, 'enable_nova_metadata')
     @patch.object(utils, 'neutron_plugin')
     @patch.object(utils, 'network_manager')
-    def test_determine_packages_quantum_ceph(self, net_man, n_plugin):
+    def test_determine_packages_quantum_ceph(self, net_man, n_plugin, en_meta):
+        en_meta.return_value = False
         self.neutron_plugin_attribute.return_value = OVS_PKGS
         net_man.return_value = 'quantum'
         n_plugin.return_value = 'ovs'
@@ -76,6 +83,18 @@
               ['ceph-common', 'nova-compute-kvm'])
         self.assertEquals(ex, result)
 
+    @patch.object(utils, 'enable_nova_metadata')
+    @patch.object(utils, 'neutron_plugin')
+    @patch.object(utils, 'network_manager')
+    def test_determine_packages_metadata(self, net_man, n_plugin, en_meta):
+        en_meta.return_value = True
+        self.neutron_plugin_attribute.return_value = OVS_PKGS
+        net_man.return_value = 'bob'
+        n_plugin.return_value = 'ovs'
+        self.relation_ids.return_value = []
+        result = utils.determine_packages()
+        self.assertTrue('nova-api-metadata' in result)
+
     @patch.object(utils, 'network_manager')
     def test_resource_map_nova_network_no_multihost(self, net_man):
         self.skipTest('skipped until contexts are properly mocked')
@@ -172,6 +191,17 @@
         result = utils.resource_map()
         self.assertTrue('/etc/neutron/neutron.conf' not in result)
 
+    @patch.object(utils, 'enable_nova_metadata')
+    @patch.object(utils, 'neutron_plugin')
+    @patch.object(utils, 'network_manager')
+    def test_resource_map_metadata(self, net_man, _plugin, _metadata):
+        _metadata.return_value = True
+        net_man.return_value = 'bob'
+        _plugin.return_value = 'ovs'
+        self.relation_ids.return_value = []
+        result = utils.resource_map()['/etc/nova/nova.conf']['services']
+        self.assertTrue('nova-api-metadata' in result)
+
     def fake_user(self, username='foo'):
         user = MagicMock()
         user.pw_dir = '/home/' + username
@@ -375,3 +405,17 @@
                                      'secret-set-value', '--secret',
                                      compute_context.CEPH_SECRET_UUID,
                                      '--base64', key])
+
+    def test_enable_nova_metadata(self):
+        class DummyContext():
+
+            def __init__(self, return_value):
+                self.return_value = return_value
+
+            def __call__(self):
+                return self.return_value
+
+        self.MetadataServiceContext.return_value = \
+            DummyContext(return_value={'metadata_shared_secret':
+                                       'sharedsecret'})
+        self.assertEqual(utils.enable_nova_metadata(), True)