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

Proposed by James Page
Status: Merged
Merged at revision: 95
Proposed branch: lp:~james-page/charm-helpers/nvp-updates
Merge into: lp:charm-helpers
Diff against target: 111 lines (+41/-1)
3 files modified
charmhelpers/contrib/openstack/context.py (+20/-1)
charmhelpers/contrib/openstack/neutron.py (+20/-0)
tests/contrib/openstack/test_os_contexts.py (+1/-0)
To merge this branch: bzr merge lp:~james-page/charm-helpers/nvp-updates
Reviewer Review Type Date Requested Status
Charm Helper Maintainers Pending
Review via email: mp+192361@code.launchpad.net

Description of the change

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

To post a comment you must log in.

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 2013-10-14 23:00:52 +0000
3+++ charmhelpers/contrib/openstack/context.py 2013-10-23 16:29:41 +0000
4@@ -385,16 +385,33 @@
5 def ovs_ctxt(self):
6 driver = neutron_plugin_attribute(self.plugin, 'driver',
7 self.network_manager)
8-
9+ config = neutron_plugin_attribute(self.plugin, 'config',
10+ self.network_manager)
11 ovs_ctxt = {
12 'core_plugin': driver,
13 'neutron_plugin': 'ovs',
14 'neutron_security_groups': self.neutron_security_groups,
15 'local_ip': unit_private_ip(),
16+ 'config': config
17 }
18
19 return ovs_ctxt
20
21+ def nvp_ctxt(self):
22+ driver = neutron_plugin_attribute(self.plugin, 'driver',
23+ self.network_manager)
24+ config = neutron_plugin_attribute(self.plugin, 'config',
25+ self.network_manager)
26+ nvp_ctxt = {
27+ 'core_plugin': driver,
28+ 'neutron_plugin': 'nvp',
29+ 'neutron_security_groups': self.neutron_security_groups,
30+ 'local_ip': unit_private_ip(),
31+ 'config': config
32+ }
33+
34+ return nvp_ctxt
35+
36 def __call__(self):
37 self._ensure_packages()
38
39@@ -408,6 +425,8 @@
40
41 if self.plugin == 'ovs':
42 ctxt.update(self.ovs_ctxt())
43+ elif self.plugin == 'nvp':
44+ ctxt.update(self.nvp_ctxt())
45
46 self._save_flag_file()
47 return ctxt
48
49=== modified file 'charmhelpers/contrib/openstack/neutron.py'
50--- charmhelpers/contrib/openstack/neutron.py 2013-10-14 23:00:52 +0000
51+++ charmhelpers/contrib/openstack/neutron.py 2013-10-23 16:29:41 +0000
52@@ -34,13 +34,23 @@
53 'services': ['quantum-plugin-openvswitch-agent'],
54 'packages': [[headers_package(), 'openvswitch-datapath-dkms'],
55 ['quantum-plugin-openvswitch-agent']],
56+ 'server_packages': ['quantum-server',
57+ 'quantum-plugin-openvswitch'],
58+ 'server_services': ['quantum-server']
59 },
60 'nvp': {
61 'config': '/etc/quantum/plugins/nicira/nvp.ini',
62 'driver': 'quantum.plugins.nicira.nicira_nvp_plugin.'
63 'QuantumPlugin.NvpPluginV2',
64+ 'contexts': [
65+ context.SharedDBContext(user=config('neutron-database-user'),
66+ database=config('neutron-database'),
67+ relation_prefix='neutron')],
68 'services': [],
69 'packages': [],
70+ 'server_packages': ['quantum-server',
71+ 'quantum-plugin-nicira'],
72+ 'server_services': ['quantum-server']
73 }
74 }
75
76@@ -60,13 +70,23 @@
77 'services': ['neutron-plugin-openvswitch-agent'],
78 'packages': [[headers_package(), 'openvswitch-datapath-dkms'],
79 ['quantum-plugin-openvswitch-agent']],
80+ 'server_packages': ['neutron-server',
81+ 'neutron-plugin-openvswitch'],
82+ 'server_services': ['neutron-server']
83 },
84 'nvp': {
85 'config': '/etc/neutron/plugins/nicira/nvp.ini',
86 'driver': 'neutron.plugins.nicira.nicira_nvp_plugin.'
87 'NeutronPlugin.NvpPluginV2',
88+ 'contexts': [
89+ context.SharedDBContext(user=config('neutron-database-user'),
90+ database=config('neutron-database'),
91+ relation_prefix='neutron')],
92 'services': [],
93 'packages': [],
94+ 'server_packages': ['neutron-server',
95+ 'neutron-plugin-nicira'],
96+ 'server_services': ['neutron-server']
97 }
98 }
99
100
101=== modified file 'tests/contrib/openstack/test_os_contexts.py'
102--- tests/contrib/openstack/test_os_contexts.py 2013-10-20 16:02:17 +0000
103+++ tests/contrib/openstack/test_os_contexts.py 2013-10-23 16:29:41 +0000
104@@ -604,6 +604,7 @@
105 attr.return_value = 'some.quantum.driver.class'
106 neutron = context.NeutronContext()
107 self.assertEquals({
108+ 'config': 'some.quantum.driver.class',
109 'core_plugin': 'some.quantum.driver.class',
110 'neutron_plugin': 'ovs',
111 'neutron_security_groups': True,

Subscribers

People subscribed via source and target branches