Merge lp:~zulcss/charms/trusty/lxd/lxd-zfs into lp:~openstack-charmers-archive/charms/trusty/lxd/next

[Chuck Short]

Add zfs support

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

charm_unit_test #829 lxd-next for zulcss mp286702
    UNIT FAIL: unit-test failed

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

Full unit test output: http://paste.ubuntu.com/
Build: http://10.245.162.36:8080/job/charm_unit_test/829/

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

charm_lint_check #931 lxd-next for zulcss mp286702
    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/
Build: http://10.245.162.36:8080/job/charm_lint_check/931/

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

charm_amulet_test #375 lxd-next for zulcss mp286702
    AMULET FAIL: amulet-test failed

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

Full amulet test output: http://paste.ubuntu.com/
Build: http://10.245.162.36:8080/job/charm_amulet_test/375/

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

charm_amulet_test #474 lxd-next for zulcss mp286702
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/474/

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

charm_amulet_test #475 lxd-next for zulcss mp286702
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/475/

[lp:~zulcss/charms/trusty/lxd/lxd-zfs]

52. By Chuck Short on 2016-02-25

Fix lint

[Chuck Short (zulcss)]

@recheck

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

charm_unit_test #1233 lxd-next for zulcss mp286702
    UNIT FAIL: unit-test failed

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

Full unit test output: http://paste.ubuntu.com/15198716/
Build: http://10.245.162.36:8080/job/charm_unit_test/1233/

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

charm_lint_check #1478 lxd-next for zulcss mp286702
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/1478/

[James Page (james-page)]

Two in-line comments and some other things to fix:

1) the other storage config options are idempotent (i.e. run the same code twice, it dtrt) - not true for zfs as there is no check to see if dev is already configured as a zfs pool device.

I'd suggest that you either use the kv store to set a flag saying 'configured' or query zfs and determine what needs to be done.

2) please add some docs to the config.yaml including the fact that zfs is >= 16.04.

review: Needs Fixing

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

charm_amulet_test #533 lxd-next for zulcss mp286702
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/533/

Unmerged revisions

52. By Chuck Short on 2016-02-25

Fix lint

51. By Chuck Short on 2016-02-19

Add zfs support

=== modified file 'hooks/lxd_utils.py'
--- hooks/lxd_utils.py	2015-10-20 10:13:31 +0000
+++ hooks/lxd_utils.py	2016-02-25 16:10:44 +0000
@@ -203,6 +203,21 @@
         create_lvm_volume_group('lxd_vg', dev)
         cmd = ['lxc', 'config', 'set', 'storage.lvm_vg_name', 'lxd_vg']
         check_call(cmd)
+    elif config('storage-type') == 'zfs':
+        if lsb_release()['DISTRIB_CODENAME'].lower() < "xenial":
+            raise Exception("zfs is not supported for Ubuntu "
+                            "versions less than 16.04 (xenial)")
+
+        status_set('maintenance',
+                   'Configuring ZFS container storage')
+        cmd = ['apt', 'install', '-y', 'zfsutils-linux']
+        check_call(cmd)
+        cmd = ['modprobe', 'zfs']
+        check_call(cmd)
+        cmd = ['zpool', 'create', '-f', 'lxd_zfs', dev]
+        check_call(cmd)
+        cmd = ['lxc', 'config', 'set', 'storage.zfs_pool_name', 'lxd_zfs']
+        check_call(cmd)
 
 
 def determine_packages():