Merge lp:~larryprice/libertine/lxc-kernel-verify into lp:libertine

[Larry Price]

Verify host kernel has lxc support.

Verify host kernel has lxc support.

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:266
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/40/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/155
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=default/117
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/117
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=default/117
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=vivid+overlay,testname=default/117
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/117
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=yakkety,testname=default/117
    None: https://jenkins.canonical.com/libertine/job/lp-generic-update-mp/125/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/158
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=vivid+overlay/143
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=xenial+overlay/143
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-1-sourcepkg/release=yakkety/143
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/136
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=vivid+overlay/136/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/136
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/136/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/136
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=yakkety/136/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/136
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=vivid+overlay/136/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/136
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/136/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/136
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=yakkety/136/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/40/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

Ok, good.

review: Approve

=== modified file 'python/libertine/HostInfo.py'
--- python/libertine/HostInfo.py	2016-06-28 14:30:01 +0000
+++ python/libertine/HostInfo.py	2016-07-05 20:51:32 +0000
@@ -22,15 +22,15 @@
 class HostInfo(object):
 
     def select_container_type_by_kernel(self):
-        kernel_release = platform.release().split('.')
-
-        if int(kernel_release[0]) >= 4:
-            return "lxc"
-        elif int(kernel_release[0]) == 3 and int(kernel_release[1]) >= 13:
+        if has_lxc_support():
             return "lxc"
         else:
             return "chroot"
 
+    def has_lxc_support(self):
+        kernel_release = platform.release().split('.')
+        return int(kernel_release[0]) >= 4 or (int(kernel_release[0]) == 3 and int(kernel_release[1]) >= 13)
+
     def get_host_distro_release(self):
         distinfo = lsb_release.get_distro_information()
 

=== modified file 'tools/libertine-container-manager'
--- tools/libertine-container-manager	2016-06-28 14:30:01 +0000
+++ tools/libertine-container-manager	2016-07-05 20:51:32 +0000
@@ -50,6 +50,10 @@
         if not args.type:
             container_type = self.host_info.select_container_type_by_kernel()
         else:
+            if args.type == 'lxc' and not self.host_info.has_lxc_support():
+                print("System kernel does not support lxc type containers. "
+                      "Please either use chroot or omit the -t option.")
+                sys.exit(1)
             container_type = args.type
 
         if not args.distro: