Merge lp:~james-page/charms/trusty/neutron-openvswitch/dkms-12.04 into lp:~openstack-charmers-archive/charms/trusty/neutron-openvswitch/next

[James Page]

Avoids a race between openvswitch starting and the dkms module being available to load on 12.04.

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #10760 neutron-openvswitch-next for james-page mp272390
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/12554431/
Build: http://10.245.162.77:8080/job/charm_lint_check/10760/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #9938 neutron-openvswitch-next for james-page mp272390
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/9938/

[lp:~james-page/charms/trusty/neutron-openvswitch/dkms-12.04]

88. By James Page on 2015-09-25

Tidy lint

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #9939 neutron-openvswitch-next for james-page mp272390
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/9939/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #10761 neutron-openvswitch-next for james-page mp272390
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/10761/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6765 neutron-openvswitch-next for james-page mp272390
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/6765/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6766 neutron-openvswitch-next for james-page mp272390
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/6766/

=== modified file 'hooks/neutron_ovs_utils.py'
--- hooks/neutron_ovs_utils.py	2015-09-12 09:03:56 +0000
+++ hooks/neutron_ovs_utils.py	2015-09-25 13:49:19 +0000
@@ -26,6 +26,8 @@
 )
 from charmhelpers.contrib.openstack.neutron import (
     parse_bridge_mappings,
+    determine_dkms_package,
+    headers_package,
 )
 from charmhelpers.contrib.openstack.context import (
     ExternalPortContext,
@@ -139,6 +141,12 @@
 
 def install_packages():
     apt_update()
+    # NOTE(jamespage): ensure early install of dkms related
+    #                  dependencies for kernels which need
+    #                  openvswitch via dkms (12.04).
+    dkms_packages = determine_dkms_package()
+    if dkms_packages:
+        apt_install([headers_package()] + dkms_packages, fatal=True)
     apt_install(filter_installed_packages(determine_packages()))
 
 

=== modified file 'unit_tests/test_neutron_ovs_utils.py'
--- unit_tests/test_neutron_ovs_utils.py	2015-09-08 14:36:08 +0000
+++ unit_tests/test_neutron_ovs_utils.py	2015-09-25 13:49:19 +0000
@@ -28,6 +28,8 @@
     'service_restart',
     'service_running',
     'ExternalPortContext',
+    'determine_dkms_package',
+    'headers_package',
 ]
 
 head_pkg = 'linux-headers-3.15.0-5-generic'
@@ -85,6 +87,20 @@
         self.apt_update.assert_called_with()
         self.apt_install.assert_called_with(self.filter_installed_packages())
 
+    @patch.object(nutils, 'determine_packages')
+    def test_install_packages_dkms_needed(self, _determine_packages):
+        _determine_packages.return_value = 'randompkg'
+        self.determine_dkms_package.return_value = \
+            ['openvswitch-datapath-dkms']
+        self.headers_package.return_value = 'linux-headers-foobar'
+        nutils.install_packages()
+        self.apt_update.assert_called_with()
+        self.apt_install.assert_has_calls([
+            call(['linux-headers-foobar',
+                  'openvswitch-datapath-dkms'], fatal=True),
+            call(self.filter_installed_packages()),
+        ])
+
     @patch.object(nutils, 'use_dvr')
     @patch.object(nutils, 'git_install_requested')
     @patch.object(charmhelpers.contrib.openstack.neutron, 'os_release')