Merge lp:~james-page/charms/trusty/lxd/lxd-liberty into lp:~openstack-charmers-archive/charms/trusty/lxd/next

[James Page]

[lp:~james-page/charms/trusty/lxd/lxd-liberty]

53. By James Page on 2016-01-05

Start to add 14.04 package support

54. By James Page on 2016-01-05

Fix 14.04 install

55. By James Page on 2016-01-05

Configure thinpool as part of charm

56. By James Page on 2016-01-05

Fixup stuff

57. By James Page on 2016-01-05

Use is_device_mounted from charmhelpers for mountcheck

58. By James Page on 2016-01-05

Ensure that any filesystem umount is persisted

59. By James Page on 2016-01-05

Fixup hooks

60. By James Page on 2016-01-05

Revert back to filesystem_mounted

61. By James Page on 2016-01-05

Ensure that only top level fs mount is detected correctly

62. By James Page on 2016-01-06

Drop workaround for lvm thinpool creation on 14.04

63. By James Page on 2016-01-06

Don't configure thinpool name

Unmerged revisions

63. By James Page on 2016-01-06

Don't configure thinpool name

62. By James Page on 2016-01-06

Drop workaround for lvm thinpool creation on 14.04

61. By James Page on 2016-01-05

Ensure that only top level fs mount is detected correctly

60. By James Page on 2016-01-05

Revert back to filesystem_mounted

59. By James Page on 2016-01-05

Fixup hooks

58. By James Page on 2016-01-05

Ensure that any filesystem umount is persisted

57. By James Page on 2016-01-05

Use is_device_mounted from charmhelpers for mountcheck

56. By James Page on 2016-01-05

Fixup stuff

55. By James Page on 2016-01-05

Configure thinpool as part of charm

54. By James Page on 2016-01-05

Fix 14.04 install

=== modified file 'hooks/lxd_hooks.py'
--- hooks/lxd_hooks.py	2015-10-26 12:59:46 +0000
+++ hooks/lxd_hooks.py	2016-01-06 09:57:53 +0000
@@ -59,7 +59,7 @@
 def config_changed():
     e_mountpoint = config('ephemeral-unmount')
     if e_mountpoint and filesystem_mounted(e_mountpoint):
-        umount(e_mountpoint)
+        umount(e_mountpoint, persist=True)
     configure_lxd_block()
     configure_lxd_host()
 

=== modified file 'hooks/lxd_utils.py'
--- hooks/lxd_utils.py	2015-10-20 10:13:31 +0000
+++ hooks/lxd_utils.py	2016-01-06 09:57:53 +0000
@@ -48,6 +48,11 @@
     'thin-provisioning-tools'
 ]
 LXD_PACKAGES = ['lxd', 'lxd-client']
+LXD_1404_PACKAGES = [
+    'lxc/trusty-backports',
+    'liblxc1/trusty-backports',
+    'python3-lxc/trusty-backports',
+]
 LXD_SOURCE_PACKAGES = [
     'lxc',
     'lxc-dev',
@@ -138,8 +143,10 @@
 def configure_lxd_block():
     '''Configure a block device for use by LXD for containers'''
     log('Configuring LXD container storage')
-    if filesystem_mounted('/var/lib/lxd'):
-        log('/varlib/lxd already configured, skipping')
+    storage_type = config('storage-type')
+
+    if filesystem_mounted('/var/lib/lxd') and storage_type == 'btrfs':
+        log('/var/lib/lxd already configured, skipping')
         return
 
     lxd_block_device = config('block-device')
@@ -174,7 +181,7 @@
     if not os.path.exists('/var/lib/lxd'):
         mkdir('/var/lib/lxd')
 
-    if config('storage-type') == 'btrfs':
+    if storage_type == 'btrfs':
         status_set('maintenance',
                    'Configuring btrfs container storage')
         service_stop('lxd')
@@ -186,19 +193,18 @@
               persist=True,
               filesystem='btrfs')
         service_start('lxd')
-    elif config('storage-type') == 'lvm':
+    elif storage_type == 'lvm':
         if (is_lvm_physical_volume(dev) and
                 list_lvm_volume_group(dev) == 'lxd_vg'):
             log('Device already configured for LVM/LXD, skipping')
             return
         status_set('maintenance',
                    'Configuring LVM container storage')
-        # Enable and startup lvm2-lvmetad to avoid extra output
-        # in lvm2 commands, which confused lxd.
-        cmd = ['systemctl', 'enable', 'lvm2-lvmetad']
-        check_call(cmd)
-        cmd = ['systemctl', 'start', 'lvm2-lvmetad']
-        check_call(cmd)
+        if os.path.exists('/run/systemd/system'):
+            cmd = ['systemctl', 'enable', 'lvm2-lvmetad']
+            check_call(cmd)
+            cmd = ['systemctl', 'start', 'lvm2-lvmetad']
+            check_call(cmd)
         create_lvm_physical_volume(dev)
         create_lvm_volume_group('lxd_vg', dev)
         cmd = ['lxc', 'config', 'set', 'storage.lvm_vg_name', 'lxd_vg']
@@ -212,13 +218,13 @@
         packages.extend(LXD_SOURCE_PACKAGES)
     else:
         packages.extend(LXD_PACKAGES)
+    # NOTE(jamespage): workaround some installability issues in trusty
+    #                  backports until resolved by LXD team.
+    if lsb_release()['DISTRIB_RELEASE'] == '14.04':
+        packages.extend(LXD_1404_PACKAGES)
     return packages
 
 
-def filesystem_mounted(fs):
-    return call(['grep', '-wqs', fs, '/proc/mounts']) == 0
-
-
 def lxd_trust_password():
     db = kv()
     password = db.get('lxd-password')
@@ -252,23 +258,14 @@
 
 @retry_on_exception(5, base_delay=2, exc_type=CalledProcessError)
 def configure_lxd_host():
-    ubuntu_release = lsb_release()['DISTRIB_CODENAME'].lower()
-    if ubuntu_release > "vivid":
-        log('>= Wily deployment - configuring LXD trust password and address',
-            level=INFO)
-        cmd = ['lxc', 'config', 'set',
-               'core.trust_password', lxd_trust_password()]
-        check_call(cmd)
-        cmd = ['lxc', 'config', 'set',
-               'core.https_address', '[::]']
-        check_call(cmd)
-    elif ubuntu_release == "vivid":
-        log('Vivid deployment - loading overlay kernel module', level=INFO)
-        cmd = ['modprobe', 'overlay']
-        check_call(cmd)
-        with open('/etc/modules', 'r+') as modules:
-            if 'overlay' not in modules.read():
-                modules.write('overlay')
+    log('Configuring LXD trust password and address',
+        level=INFO)
+    cmd = ['lxc', 'config', 'set',
+           'core.trust_password', lxd_trust_password()]
+    check_call(cmd)
+    cmd = ['lxc', 'config', 'set',
+           'core.https_address', '[::]']
+    check_call(cmd)
 
 
 def clean_storage(block_device):
@@ -293,6 +290,11 @@
     zap_disk(block_device)
 
 
+def filesystem_mounted(fs):
+    return call(['grep', '-wqs',
+                 ".* {} .*".format(fs), '/proc/mounts']) == 0
+
+
 def lxd_running():
     '''Check whether LXD is running or not'''
     cmd = ['pgrep', 'lxd']