Merge lp:~james-page/charm-helpers/nvp-updates into lp:charm-helpers

[James Page]

Misc fixes to support the NVP neutron plugin across various
openstack charms.

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2013-10-14 23:00:52 +0000
+++ charmhelpers/contrib/openstack/context.py	2013-10-23 16:29:41 +0000
@@ -385,16 +385,33 @@
     def ovs_ctxt(self):
         driver = neutron_plugin_attribute(self.plugin, 'driver',
                                           self.network_manager)
-
+        config = neutron_plugin_attribute(self.plugin, 'config',
+                                          self.network_manager)
         ovs_ctxt = {
             'core_plugin': driver,
             'neutron_plugin': 'ovs',
             'neutron_security_groups': self.neutron_security_groups,
             'local_ip': unit_private_ip(),
+            'config': config
         }
 
         return ovs_ctxt
 
+    def nvp_ctxt(self):
+        driver = neutron_plugin_attribute(self.plugin, 'driver',
+                                          self.network_manager)
+        config = neutron_plugin_attribute(self.plugin, 'config',
+                                          self.network_manager)
+        nvp_ctxt = {
+            'core_plugin': driver,
+            'neutron_plugin': 'nvp',
+            'neutron_security_groups': self.neutron_security_groups,
+            'local_ip': unit_private_ip(),
+            'config': config
+        }
+
+        return nvp_ctxt
+
     def __call__(self):
         self._ensure_packages()
 
@@ -408,6 +425,8 @@
 
         if self.plugin == 'ovs':
             ctxt.update(self.ovs_ctxt())
+        elif self.plugin == 'nvp':
+            ctxt.update(self.nvp_ctxt())
 
         self._save_flag_file()
         return ctxt

=== modified file 'charmhelpers/contrib/openstack/neutron.py'
--- charmhelpers/contrib/openstack/neutron.py	2013-10-14 23:00:52 +0000
+++ charmhelpers/contrib/openstack/neutron.py	2013-10-23 16:29:41 +0000
@@ -34,13 +34,23 @@
             'services': ['quantum-plugin-openvswitch-agent'],
             'packages': [[headers_package(), 'openvswitch-datapath-dkms'],
                          ['quantum-plugin-openvswitch-agent']],
+            'server_packages': ['quantum-server',
+                                'quantum-plugin-openvswitch'],
+            'server_services': ['quantum-server']
         },
         'nvp': {
             'config': '/etc/quantum/plugins/nicira/nvp.ini',
             'driver': 'quantum.plugins.nicira.nicira_nvp_plugin.'
                       'QuantumPlugin.NvpPluginV2',
+            'contexts': [
+                context.SharedDBContext(user=config('neutron-database-user'),
+                                        database=config('neutron-database'),
+                                        relation_prefix='neutron')],
             'services': [],
             'packages': [],
+            'server_packages': ['quantum-server',
+                                'quantum-plugin-nicira'],
+            'server_services': ['quantum-server']
         }
     }
 
@@ -60,13 +70,23 @@
             'services': ['neutron-plugin-openvswitch-agent'],
             'packages': [[headers_package(), 'openvswitch-datapath-dkms'],
                          ['quantum-plugin-openvswitch-agent']],
+            'server_packages': ['neutron-server',
+                                'neutron-plugin-openvswitch'],
+            'server_services': ['neutron-server']
         },
         'nvp': {
             'config': '/etc/neutron/plugins/nicira/nvp.ini',
             'driver': 'neutron.plugins.nicira.nicira_nvp_plugin.'
                       'NeutronPlugin.NvpPluginV2',
+            'contexts': [
+                context.SharedDBContext(user=config('neutron-database-user'),
+                                        database=config('neutron-database'),
+                                        relation_prefix='neutron')],
             'services': [],
             'packages': [],
+            'server_packages': ['neutron-server',
+                                'neutron-plugin-nicira'],
+            'server_services': ['neutron-server']
         }
     }
 

=== modified file 'tests/contrib/openstack/test_os_contexts.py'
--- tests/contrib/openstack/test_os_contexts.py	2013-10-20 16:02:17 +0000
+++ tests/contrib/openstack/test_os_contexts.py	2013-10-23 16:29:41 +0000
@@ -604,6 +604,7 @@
         attr.return_value = 'some.quantum.driver.class'
         neutron = context.NeutronContext()
         self.assertEquals({
+            'config': 'some.quantum.driver.class',
             'core_plugin': 'some.quantum.driver.class',
             'neutron_plugin': 'ovs',
             'neutron_security_groups': True,