Charm Helpers

Merge lp:~james-page/charm-helpers/optimize-dkms-headers into lp:charm-helpers

  1. optimize-dkms-headers
  2. Merge into devel
Proposed by James Page
Status: Merged
Merged at revision: 520
Proposed branch: lp:~james-page/charm-helpers/optimize-dkms-headers
Merge into: lp:charm-helpers
Diff against target: 74 lines (+9/-7)
2 files modified
charmhelpers/contrib/openstack/neutron.py (+6/-6)
tests/contrib/openstack/test_neutron_utils.py (+3/-1)
To merge this branch: bzr merge lp:~james-page/charm-helpers/optimize-dkms-headers
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+282927@code.launchpad.net

Description of the change

This change ties to install of headers packages to the requirement for the OVS DKMS package.

This is only required on 12.04, for 14.04 a) the headers package is already installed and b) we don't need DKMS OVS anyway.

This also helps towards getting OpenStack running under LXD for all-in-one installs.

To post a comment you must log in.
Revision history for this message
Liam Young (gnuoy) wrote :

Approved

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/neutron.py'
2--- charmhelpers/contrib/openstack/neutron.py 2015-10-29 19:42:43 +0000
3+++ charmhelpers/contrib/openstack/neutron.py 2016-01-18 11:30:19 +0000
4@@ -50,7 +50,7 @@
5 if kernel_version() >= (3, 13):
6 return []
7 else:
8- return ['openvswitch-datapath-dkms']
9+ return [headers_package(), 'openvswitch-datapath-dkms']
10
11
12 # legacy
13@@ -70,7 +70,7 @@
14 relation_prefix='neutron',
15 ssl_dir=QUANTUM_CONF_DIR)],
16 'services': ['quantum-plugin-openvswitch-agent'],
17- 'packages': [[headers_package()] + determine_dkms_package(),
18+ 'packages': [determine_dkms_package(),
19 ['quantum-plugin-openvswitch-agent']],
20 'server_packages': ['quantum-server',
21 'quantum-plugin-openvswitch'],
22@@ -111,7 +111,7 @@
23 relation_prefix='neutron',
24 ssl_dir=NEUTRON_CONF_DIR)],
25 'services': ['neutron-plugin-openvswitch-agent'],
26- 'packages': [[headers_package()] + determine_dkms_package(),
27+ 'packages': [determine_dkms_package(),
28 ['neutron-plugin-openvswitch-agent']],
29 'server_packages': ['neutron-server',
30 'neutron-plugin-openvswitch'],
31@@ -155,7 +155,7 @@
32 relation_prefix='neutron',
33 ssl_dir=NEUTRON_CONF_DIR)],
34 'services': [],
35- 'packages': [[headers_package()] + determine_dkms_package(),
36+ 'packages': [determine_dkms_package(),
37 ['neutron-plugin-cisco']],
38 'server_packages': ['neutron-server',
39 'neutron-plugin-cisco'],
40@@ -174,7 +174,7 @@
41 'neutron-dhcp-agent',
42 'nova-api-metadata',
43 'etcd'],
44- 'packages': [[headers_package()] + determine_dkms_package(),
45+ 'packages': [determine_dkms_package(),
46 ['calico-compute',
47 'bird',
48 'neutron-dhcp-agent',
49@@ -219,7 +219,7 @@
50 relation_prefix='neutron',
51 ssl_dir=NEUTRON_CONF_DIR)],
52 'services': [],
53- 'packages': [[headers_package()] + determine_dkms_package()],
54+ 'packages': [determine_dkms_package()],
55 'server_packages': ['neutron-server',
56 'python-neutron-plugin-midonet'],
57 'server_services': ['neutron-server']
58
59=== modified file 'tests/contrib/openstack/test_neutron_utils.py'
60--- tests/contrib/openstack/test_neutron_utils.py 2015-10-07 10:57:11 +0000
61+++ tests/contrib/openstack/test_neutron_utils.py 2016-01-18 11:30:19 +0000
62@@ -34,9 +34,11 @@
63
64 @patch.object(neutron, 'kernel_version')
65 def test_determine_dkms_package_old_kernel(self, _kernel_version):
66+ self.check_output.return_value = b'3.4.0-19-generic'
67 _kernel_version.return_value = (3, 10)
68 dkms_package = neutron.determine_dkms_package()
69- self.assertEquals(dkms_package, ['openvswitch-datapath-dkms'])
70+ self.assertEquals(dkms_package, ['linux-headers-3.4.0-19-generic',
71+ 'openvswitch-datapath-dkms'])
72
73 @patch.object(neutron, 'kernel_version')
74 def test_determine_dkms_package_new_kernel(self, _kernel_version):

Subscribers

People subscribed via source and target branches