Merge ~vultaire/charm-juju-lxd:profile-fix into ~afreiberger/charm-juju-lxd:init_with_dir_storage

[Paul Goins]

[Drew Freiberger (afreiberger)]

lgtm

[Drew Freiberger (afreiberger)]

review: Approve

diff --git a/files/lxd-profile-dir.yaml b/files/lxd-profile-dir.yaml
new file mode 100644
index 0000000..fb1f463
--- /dev/null
+++ b/files/lxd-profile-dir.yaml
@@ -0,0 +1,32 @@
+name: juju-default
+config:
+  boot.autostart: "false"
+  security.nesting: "true"
+  security.privileged: "true"
+  linux.kernel_modules: openvswitch,nbd,ip_tables,ip6_tables
+devices:
+  eth0:
+    mtu: "9000"
+    name: eth0
+    nictype: bridged
+    parent: lxdbr0
+    type: nic
+  eth1:
+    mtu: "9000"
+    name: eth1
+    nictype: bridged
+    parent: lxdbr0
+    type: nic
+  kvm:
+    path: /dev/kvm
+    type: unix-char
+  mem:
+    path: /dev/mem
+    type: unix-char
+  root:
+    path: /
+    type: disk
+    pool: default
+  tun:
+    path: /dev/net/tun
+    type: unix-char
diff --git a/files/lxd-profile.yaml b/files/lxd-profile-zfs.yaml
similarity index 100%
rename from files/lxd-profile.yaml
rename to files/lxd-profile-zfs.yaml
diff --git a/reactive/juju_lxd.py b/reactive/juju_lxd.py
index 25177e5..db1c0dd 100644
--- a/reactive/juju_lxd.py
+++ b/reactive/juju_lxd.py
@@ -106,7 +106,11 @@ def lxd_init():
     except:
         pass
 
-    with open('files/lxd-profile.yaml', 'r') as profileyaml:
+    if use_zfs:
+        default_profile_yaml = 'files/lxd-profile-zfs.yaml'
+    else:
+        default_profile_yaml = 'files/lxd-profile-dir.yaml'
+    with open(default_profile_yaml, 'r') as profileyaml:
         try:
             subprocess.check_output(['lxc', 'profile', 'edit', 'juju-default'],
                                     stdin=profileyaml)