Merge ~andreserl/maas:lp1585841_add_zfs into maas:master

[Andres Rodriguez]

LP: #1585841 - Add 'zfs' support as a filesystem option.

This is dependent on [1]. Initial discussion was that MAAS was not to make any changes other than add an additional filesystem option, which curtin would handle and create zfs root.

MAAS needs to surface this as experimental.

[1]: https://code.launchpad.net/~raharper/curtin/+git/curtin/+merge/335478

[Newell Jensen (newell-jensen)]

LGTM +1

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1585841_add_zfs lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/1326/console
COMMIT: d91aa001d9243d33f8fe63566eb2631fca9fc463

review: Needs Fixing

[Ryan Harper (raharper)]

I think we can make this work. In this branch, we key off of fstype: 'zfsroot' to indicate that we want to do a zfsroot filesystem.

https://code.launchpad.net/~raharper/curtin/+git/curtin/+merge/336723

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1585841_add_zfs lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/1369/console
COMMIT: 7f21378e7f4a47db563c7c14f732306317b4512b

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1585841_add_zfs lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/1392/console
COMMIT: a264d3f89173e7a8f6130f54a6a1fb02a6de5186

review: Needs Fixing

[Blake Rouse (blake-rouse)]

Looks good

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b lp1585841_add_zfs lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/1449/consoleText

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1585841_add_zfs lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/1452/console
COMMIT: 583c4d33c35b16c42cbb5b8ff97d4d7225b12eea

review: Needs Fixing

diff --git a/src/maasserver/enum.py b/src/maasserver/enum.py
index c97b0cd..e823380 100644
--- a/src/maasserver/enum.py
+++ b/src/maasserver/enum.py
@@ -513,6 +513,9 @@ class FILESYSTEM_TYPE:
     #: BTRFS
     BTRFS = "btrfs"
 
+    #: ZFS
+    ZFSROOT = "zfsroot"
+
 
 # Django choices for FILESYSTEM_TYPE: sequence of tuples (key, UI
 # representation).
@@ -533,6 +536,7 @@ FILESYSTEM_TYPE_CHOICES = (
     (FILESYSTEM_TYPE.RAMFS, "ramfs"),
     (FILESYSTEM_TYPE.TMPFS, "tmpfs"),
     (FILESYSTEM_TYPE.BTRFS, "btrfs"),
+    (FILESYSTEM_TYPE.ZFSROOT, "zfsroot"),
     )
 
 
@@ -551,6 +555,7 @@ FILESYSTEM_FORMAT_TYPE_CHOICES = (
     (FILESYSTEM_TYPE.RAMFS, "ramfs"),
     (FILESYSTEM_TYPE.TMPFS, "tmpfs"),
     (FILESYSTEM_TYPE.BTRFS, "btrfs"),
+    (FILESYSTEM_TYPE.ZFSROOT, "zfsroot"),
     )
 
 
diff --git a/src/maasserver/migrations/builtin/maasserver/0144_filesystem_zfsroot_support.py b/src/maasserver/migrations/builtin/maasserver/0144_filesystem_zfsroot_support.py
new file mode 100644
index 0000000..6fde3ab
--- /dev/null
+++ b/src/maasserver/migrations/builtin/maasserver/0144_filesystem_zfsroot_support.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.9 on 2018-02-07 15:26
+from __future__ import unicode_literals
+
+from django.db import (
+    migrations,
+    models,
+)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('maasserver', '0143_blockdevice_firmware'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='filesystem',
+            name='fstype',
+            field=models.CharField(choices=[('ext2', 'ext2'), ('ext4', 'ext4'), ('xfs', 'xfs'), ('fat32', 'fat32'), ('vfat', 'vfat'), ('lvm-pv', 'lvm'), ('raid', 'raid'), ('raid-spare', 'raid-spare'), ('bcache-cache', 'bcache-cache'), ('bcache-backing', 'bcache-backing'), ('swap', 'swap'), ('ramfs', 'ramfs'), ('tmpfs', 'tmpfs'), ('btrfs', 'btrfs'), ('zfsroot', 'zfsroot')], default='ext4', max_length=20),
+        ),
+    ]