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

[Liam Young]

[lp:~gnuoy/charms/trusty/nova-compute/legacy_mode]

112. By Liam Young <email address hidden> on 2015-03-31

Merged next in

113. By Liam Young <email address hidden> on 2015-03-31

Check neutron_plugin_legacy_mode when compiling list of packages

=== modified file 'config.yaml'
--- config.yaml	2015-03-31 08:46:52 +0000
+++ config.yaml	2015-03-31 10:52:38 +0000
@@ -196,3 +196,11 @@
     description: |
       YAML formatted associative array of sysctl values, e.g.:
       '{ kernel.pid_max : 4194303 }'
+  manage-neutron-plugin-legacy-mode:
+    type: boolean
+    default: True
+    description: |
+      If True nova-compute will install neutron packages for the plugin
+      stipulated by nova-cloud-controller. The option is only available for
+      backward compatibility for deployments which do not use the neutron-api
+      charm. Please do not enable this on new deployments.

=== modified file 'hooks/nova_compute_hooks.py'
--- hooks/nova_compute_hooks.py	2015-03-31 08:49:33 +0000
+++ hooks/nova_compute_hooks.py	2015-03-31 10:52:38 +0000
@@ -47,7 +47,6 @@
     initialize_ssh_keys,
     migration_enabled,
     network_manager,
-    neutron_plugin,
     do_openstack_upgrade,
     public_ssh_key,
     restart_map,
@@ -58,7 +57,8 @@
     ceph_config_file, CEPH_SECRET,
     enable_shell, disable_shell,
     fix_path_ownership,
-    assert_charm_supports_ipv6
+    assert_charm_supports_ipv6,
+    manage_ovs,
 )
 
 from charmhelpers.contrib.network.ip import (
@@ -140,10 +140,10 @@
         return
     CONFIGS.write(NOVA_CONF)
     # No need to write NEUTRON_CONF if neutron-plugin is managing it
-    if not relation_ids('neutron-plugin'):
-        if network_manager() == 'quantum' and neutron_plugin() == 'ovs':
+    if manage_ovs():
+        if network_manager() == 'quantum':
             CONFIGS.write(QUANTUM_CONF)
-        if network_manager() == 'neutron' and neutron_plugin() == 'ovs':
+        if network_manager() == 'neutron':
             CONFIGS.write(NEUTRON_CONF)
 
 

=== modified file 'hooks/nova_compute_utils.py'
--- hooks/nova_compute_utils.py	2015-03-31 08:46:52 +0000
+++ hooks/nova_compute_utils.py	2015-03-31 10:52:38 +0000
@@ -177,7 +177,7 @@
     if net_manager in ['neutron', 'quantum']:
         # This stanza supports the legacy case of ovs supported within
         # compute charm code (now moved to neutron-openvswitch subordinate)
-        if not relation_ids('neutron-plugin') and plugin == 'ovs':
+        if manage_ovs():
             if net_manager == 'quantum':
                 nm_rsc = QUANTUM_RESOURCES
             if net_manager == 'neutron':
@@ -260,7 +260,8 @@
     if (net_manager in ['flatmanager', 'flatdhcpmanager'] and
             config('multi-host').lower() == 'yes'):
         packages.extend(['nova-api', 'nova-network'])
-    elif net_manager in ['quantum', 'neutron']:
+    elif (net_manager in ['quantum', 'neutron']
+            and neutron_plugin_legacy_mode()):
         plugin = neutron_plugin()
         pkg_lists = neutron_plugin_attribute(plugin, 'packages', net_manager)
         for pkg_list in pkg_lists:
@@ -499,3 +500,16 @@
 def enable_nova_metadata():
     ctxt = MetadataServiceContext()()
     return 'metadata_shared_secret' in ctxt
+
+
+def neutron_plugin_legacy_mode():
+    # If a charm is attatched to the neutron-plugin relation then its managing
+    # neutron
+    if relation_ids('neutron-plugin'):
+        return False
+    else:
+        return config('manage-neutron-plugin-legacy-mode')
+
+
+def manage_ovs():
+    return neutron_plugin_legacy_mode() and neutron_plugin() == 'ovs'

=== modified file 'unit_tests/test_nova_compute_hooks.py'
--- unit_tests/test_nova_compute_hooks.py	2015-03-31 08:49:33 +0000
+++ unit_tests/test_nova_compute_hooks.py	2015-03-31 10:52:38 +0000
@@ -42,7 +42,7 @@
     'migration_enabled',
     'do_openstack_upgrade',
     'network_manager',
-    'neutron_plugin',
+    'manage_ovs',
     'public_ssh_key',
     'register_configs',
     'disable_shell',
@@ -164,7 +164,6 @@
         configs.write = MagicMock()
         if quantum:
             self.network_manager.return_value = 'quantum'
-            self.neutron_plugin.return_value = 'ovs'
         hooks.amqp_changed()
 
     @patch.object(hooks, 'CONFIGS')
@@ -183,6 +182,7 @@
 
     @patch.object(hooks, 'CONFIGS')
     def test_amqp_changed_with_data_and_quantum_api(self, configs):
+        self.manage_ovs.return_value = False
         self.relation_ids.return_value = ['neutron-plugin:0']
         self._amqp_test(configs, quantum=True)
         self.assertEquals([call('/etc/nova/nova.conf')],

=== modified file 'unit_tests/test_nova_compute_utils.py'
--- unit_tests/test_nova_compute_utils.py	2015-02-25 15:02:09 +0000
+++ unit_tests/test_nova_compute_utils.py	2015-03-31 10:52:38 +0000
@@ -69,11 +69,30 @@
         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, en_meta):
-        en_meta.return_value = False
+    @patch.object(utils, 'neutron_plugin_legacy_mode')
+    @patch.object(utils, 'enable_nova_metadata')
+    @patch.object(utils, 'neutron_plugin')
+    @patch.object(utils, 'network_manager')
+    def test_determine_packages_quantum_legacy_off(self, net_man, n_plugin,
+                                                   en_meta, leg_mode):
+        en_meta.return_value = False
+        leg_mode.return_value = False
+        self.neutron_plugin_attribute.return_value = OVS_PKGS
+        net_man.return_value = 'quantum'
+        n_plugin.return_value = 'ovs'
+        self.relation_ids.return_value = []
+        result = utils.determine_packages()
+        ex = utils.BASE_PACKAGES + ['nova-compute-kvm']
+        self.assertEquals(ex, result)
+
+    @patch.object(utils, 'neutron_plugin_legacy_mode')
+    @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, en_meta,
+                                             leg_mode):
+        en_meta.return_value = False
+        leg_mode.return_value = True
         self.neutron_plugin_attribute.return_value = OVS_PKGS
         net_man.return_value = 'quantum'
         n_plugin.return_value = 'ovs'
@@ -419,3 +438,40 @@
             DummyContext(return_value={'metadata_shared_secret':
                                        'sharedsecret'})
         self.assertEqual(utils.enable_nova_metadata(), True)
+
+    def test_neutron_plugin_legacy_mode_plugin(self):
+        self.relation_ids.return_value = ['neutron-plugin:0']
+        self.assertFalse(utils.neutron_plugin_legacy_mode())
+
+    def test_neutron_plugin_legacy_mode_legacy_off(self):
+        self.relation_ids.return_value = []
+        self.test_config.set('manage-neutron-plugin-legacy-mode', False)
+        self.assertFalse(utils.neutron_plugin_legacy_mode())
+
+    def test_neutron_plugin_legacy_mode_legacy_on(self):
+        self.relation_ids.return_value = []
+        self.test_config.set('manage-neutron-plugin-legacy-mode', True)
+        self.assertTrue(utils.neutron_plugin_legacy_mode())
+
+    @patch.object(utils, 'neutron_plugin_legacy_mode')
+    def test_manage_ovs_legacy_mode_legacy_off(self,
+                                               _neutron_plugin_legacy_mode):
+        _neutron_plugin_legacy_mode.return_value = False
+        self.assertFalse(utils.manage_ovs())
+
+    @patch.object(utils, 'neutron_plugin')
+    @patch.object(utils, 'neutron_plugin_legacy_mode')
+    def test_manage_ovs_legacy_mode_legacy_on(self,
+                                              _neutron_plugin_legacy_mode,
+                                              _neutron_plugin):
+        _neutron_plugin_legacy_mode.return_value = True
+        _neutron_plugin.return_value = 'ovs'
+        self.assertTrue(utils.manage_ovs())
+
+    @patch.object(utils, 'neutron_plugin')
+    @patch.object(utils, 'neutron_plugin_legacy_mode')
+    def test_manage_ovs_legacy_mode_not_ovs(self, _neutron_plugin_legacy_mode,
+                                            _neutron_plugin):
+        _neutron_plugin_legacy_mode.return_value = True
+        _neutron_plugin.return_value = 'bobvs'
+        self.assertFalse(utils.manage_ovs())