Charm Helpers

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

  1. vmware-nsx-updates
  2. Merge into devel
Proposed by James Page
Status: Merged
Merged at revision: 147
Proposed branch: lp:~james-page/charm-helpers/vmware-nsx-updates
Merge into: lp:charm-helpers
Diff against target: 83 lines (+23/-5)
3 files modified
charmhelpers/contrib/openstack/context.py (+1/-1)
charmhelpers/contrib/openstack/neutron.py (+17/-1)
tests/contrib/openstack/test_neutron_utils.py (+5/-3)
To merge this branch: bzr merge lp:~james-page/charm-helpers/vmware-nsx-updates
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
charmers Pending
Review via email: mp+218218@code.launchpad.net

Description of the change

Update to support use of NVP/NSX with icehouse openstack release.

To post a comment you must log in.
lp:~james-page/charm-helpers/vmware-nsx-updates updated
150. By James Page

Rebase

Revision history for this message
Liam Young (gnuoy) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/contrib/openstack/context.py'
2--- charmhelpers/contrib/openstack/context.py 2014-04-02 12:17:07 +0000
3+++ charmhelpers/contrib/openstack/context.py 2014-05-04 23:10:01 +0000
4@@ -570,7 +570,7 @@
5
6 if self.plugin == 'ovs':
7 ctxt.update(self.ovs_ctxt())
8- elif self.plugin == 'nvp':
9+ elif self.plugin in ['nvp', 'nsx']:
10 ctxt.update(self.nvp_ctxt())
11
12 alchemy_flags = config('neutron-alchemy-flags')
13
14=== modified file 'charmhelpers/contrib/openstack/neutron.py'
15--- charmhelpers/contrib/openstack/neutron.py 2014-03-26 10:26:36 +0000
16+++ charmhelpers/contrib/openstack/neutron.py 2014-05-04 23:10:01 +0000
17@@ -114,14 +114,30 @@
18 'server_packages': ['neutron-server',
19 'neutron-plugin-nicira'],
20 'server_services': ['neutron-server']
21+ },
22+ 'nsx': {
23+ 'config': '/etc/neutron/plugins/vmware/nsx.ini',
24+ 'driver': 'vmware',
25+ 'contexts': [
26+ context.SharedDBContext(user=config('neutron-database-user'),
27+ database=config('neutron-database'),
28+ relation_prefix='neutron',
29+ ssl_dir=NEUTRON_CONF_DIR)],
30+ 'services': [],
31+ 'packages': [],
32+ 'server_packages': ['neutron-server',
33+ 'neutron-plugin-vmware'],
34+ 'server_services': ['neutron-server']
35 }
36 }
37- # NOTE: patch in ml2 plugin for icehouse onwards
38 if release >= 'icehouse':
39+ # NOTE: patch in ml2 plugin for icehouse onwards
40 plugins['ovs']['config'] = '/etc/neutron/plugins/ml2/ml2_conf.ini'
41 plugins['ovs']['driver'] = 'neutron.plugins.ml2.plugin.Ml2Plugin'
42 plugins['ovs']['server_packages'] = ['neutron-server',
43 'neutron-plugin-ml2']
44+ # NOTE: patch in vmware renames nvp->nsx for icehouse onwards
45+ plugins['nvp'] = plugins['nsx']
46 return plugins
47
48
49
50=== modified file 'tests/contrib/openstack/test_neutron_utils.py'
51--- tests/contrib/openstack/test_neutron_utils.py 2014-04-07 08:42:55 +0000
52+++ tests/contrib/openstack/test_neutron_utils.py 2014-05-04 23:10:01 +0000
53@@ -52,17 +52,19 @@
54
55 def test_neutron_plugins_preicehouse(self):
56 self.config.return_value = 'foo'
57- self.os_release .return_value = 'havana'
58+ self.os_release.return_value = 'havana'
59 plugins = neutron.neutron_plugins()
60 self.assertEquals(plugins['ovs']['config'], '/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini')
61 self.assertEquals(plugins['nvp']['services'], [])
62
63 def test_neutron_plugins(self):
64 self.config.return_value = 'foo'
65- self.os_release .return_value = 'icehouse'
66+ self.os_release.return_value = 'icehouse'
67 plugins = neutron.neutron_plugins()
68 self.assertEquals(plugins['ovs']['config'], '/etc/neutron/plugins/ml2/ml2_conf.ini')
69+ self.assertEquals(plugins['nvp']['config'], '/etc/neutron/plugins/vmware/nsx.ini')
70 self.assertEquals(plugins['nvp']['services'], [])
71+ self.assertEquals(plugins['nsx'], plugins['nvp'])
72
73 @patch.object(neutron, 'network_manager')
74 def test_neutron_plugin_attribute_quantum(self, _network_manager):
75@@ -74,7 +76,7 @@
76 @patch.object(neutron, 'network_manager')
77 def test_neutron_plugin_attribute_neutron(self, _network_manager):
78 self.config.return_value = 'foo'
79- self.os_release .return_value = 'icehouse'
80+ self.os_release.return_value = 'icehouse'
81 _network_manager.return_value = 'neutron'
82 plugins = neutron.neutron_plugin_attribute('ovs', 'services')
83 self.assertEquals(plugins, ['neutron-plugin-openvswitch-agent'])

Subscribers

People subscribed via source and target branches