Merge ~afreiberger/charm-juju-lxd:init_with_dir_storage into charm-juju-lxd:master

[Drew Freiberger]

[Alvaro Uria (aluria)]

Please see comment inline. Other than that, +1

[Drew Freiberger (afreiberger)]

The condition is trapped higher up, and I'd rather not spend too much time reworking this to set status per group when most situations only support the one group ATM.

review: Needs Resubmitting

[Drew Freiberger (afreiberger)]

This branch is in-use on charmlab and is ready to merge with master.

review: Needs Resubmitting

[Paul Goins (vultaire)]

review: Approve

diff --git a/config.yaml b/config.yaml
index 8db0ec4..0548271 100644
--- a/config.yaml
+++ b/config.yaml
@@ -2,7 +2,7 @@ options:
   lxd-group:
     type: string
     default: "bootstack-squad"
-    description: user group that should have members added to local lxd group
+    description: user group that should have members added to local lxd group (additional groups can be added with comma separation)
   use-zfs:
     type: boolean
     default: false
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/metadata.yaml b/metadata.yaml
index 7791876..d408c34 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -6,6 +6,7 @@ description: |
   on a juju managed node that will run openstack-on-lxd bundle from james-page.
 series:
   - xenial
+  - bionic
 tags:
   - juju
   - lxd
diff --git a/reactive/juju_lxd.py b/reactive/juju_lxd.py
index c6c83ff..c8a1cca 100644
--- a/reactive/juju_lxd.py
+++ b/reactive/juju_lxd.py
@@ -50,21 +50,21 @@ def status_set(state, message):
 @when_not('juju-lxd.configured')
 def juju_lxd_configure():
     config = hookenv.config()
-    src_group = config.get('lxd-group')
+    src_groups = config.get('lxd-group').split(',')
     dst_group = 'lxd'
 
     if group_exists(dst_group):
         try:
-            sync_groups(src=src_group, dst='lxd')
+            sync_groups(src_groups=src_groups, dst='lxd')
         except KeyError:
             status_set('blocked',
-                       'lxd-group "{0}" does not exist'.format(src_group))
+                       'lxd-group "{0}" does not exist'.format(src_groups))
         finally:
             data_changed('juju-lxd.config', config)
             set_state('juju-lxd.configured')
             status_set('active', 'Ready')
     else:
-        status_set('blocked', 'group "{0}" does not exist'.format(dst_group))
+        status_set('blocked', 'LXD group "{0}" does not exist'.format(dst_group))
 
 
 @when('juju-lxd.configured')
@@ -95,7 +95,7 @@ def lxd_init():
     subprocess.call(['lxc', 'network', 'delete', 'lxdbr0'])
     subprocess.call(['lxc', 'network', 'create', 'lxdbr0',
                      'ipv4.address=10.0.8.1/24', 'ipv6.address=none',
-                     'ipv4.nat=true'])
+                     'ipv4.nat=true', 'ipv4.dhcp.ranges=10.0.8.2-10.0.8.200'])
     subprocess.call(['lxc', 'network', 'attach-profile', 'lxdbr0', 'default',
                      'eth0'])
     subprocess.call(['lxc', 'profile', 'device', 'set', 'default', 'eth0',
@@ -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)
@@ -124,13 +128,16 @@ def git_repo():
         pass
 
 
-def sync_groups(src, dst):
+def sync_groups(src_groups, dst):
     ''' Makes the dst group contain the same users as the src group.
     If src is empty, the dst group will be emptied too'''
     # Will raise KeyError if src is empty or non-existent
-    if src in [None, '']:
-        users = ''
-    else:
-        users = ','.join(grp.getgrnam(src).gr_mem)
+    members = []
+    for group in src_groups:
+        if group not in [None, '']:
+            members.extend(grp.getgrnam(group).gr_mem)
+    # using set to create unique list of members
+    users = ','.join(list(set(members)))
     status_set("maintenance", "configuring users in lxd group")
     subprocess.call(['gpasswd', '-M', users, dst])
+