merge from master at 0.7.8-34-ga1cdebd

1 files changed, 129 insertions, 44 deletions

diff --git a/cloudinit/config/cc_lxd.py b/cloudinit/config/cc_lxd.py
index 0086840f..3e7faca7 100644
--- a/cloudinit/config/cc_lxd.py
+++ b/cloudinit/config/cc_lxd.py
@@ -17,35 +17,50 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-This module initializes lxd using 'lxd init'
-
-Example config:
-  #cloud-config
-  lxd:
-    init:
-      network_address: <ip addr>
-      network_port: <port>
-      storage_backend: <zfs/dir>
-      storage_create_device: <dev>
-      storage_create_loop: <size>
-      storage_pool: <name>
-      trust_password: <password>
-    bridge:
-      mode: <new, existing or none>
-      name: <name>
-      ipv4_address: <ip addr>
-      ipv4_netmask: <cidr>
-      ipv4_dhcp_first: <ip addr>
-      ipv4_dhcp_last: <ip addr>
-      ipv4_dhcp_leases: <size>
-      ipv4_nat: <bool>
-      ipv6_address: <ip addr>
-      ipv6_netmask: <cidr>
-      ipv6_nat: <bool>
-      domain: <domain>
+LXD
+---
+**Summary:** configure lxd with ``lxd init`` and optionally lxd-bridge
+
+This module configures lxd with user specified options using ``lxd init``.
+If lxd is not present on the system but lxd configuration is provided, then
+lxd will be installed. If the selected storage backend is zfs, then zfs will
+be installed if missing. If network bridge configuration is provided, then
+lxd-bridge will be configured accordingly.
+
+**Internal name:** ``cc_lxd``
+
+**Module frequency:** per instance
+
+**Supported distros:** ubuntu
+
+**Config keys**::
+
+    lxd:
+        init:
+            network_address: <ip addr>
+            network_port: <port>
+            storage_backend: <zfs/dir>
+            storage_create_device: <dev>
+            storage_create_loop: <size>
+            storage_pool: <name>
+            trust_password: <password>
+        bridge:
+            mode: <new, existing or none>
+            name: <name>
+            ipv4_address: <ip addr>
+            ipv4_netmask: <cidr>
+            ipv4_dhcp_first: <ip addr>
+            ipv4_dhcp_last: <ip addr>
+            ipv4_dhcp_leases: <size>
+            ipv4_nat: <bool>
+            ipv6_address: <ip addr>
+            ipv6_netmask: <cidr>
+            ipv6_nat: <bool>
+            domain: <domain>
 """
 
 from cloudinit import util
+import os
 
 distros = ['ubuntu']
 
@@ -105,25 +120,43 @@ def handle(name, cfg, cloud, log, args):
 
     # Set up lxd-bridge if bridge config is given
     dconf_comm = "debconf-communicate"
-    if bridge_cfg and util.which(dconf_comm):
-        debconf = bridge_to_debconf(bridge_cfg)
+    if bridge_cfg:
+        if os.path.exists("/etc/default/lxd-bridge") \
+                and util.which(dconf_comm):
+            # Bridge configured through packaging
+
+            debconf = bridge_to_debconf(bridge_cfg)
+
+            # Update debconf database
+            try:
+                log.debug("Setting lxd debconf via " + dconf_comm)
+                data = "\n".join(["set %s %s" % (k, v)
+                                  for k, v in debconf.items()]) + "\n"
+                util.subp(['debconf-communicate'], data)
+            except Exception:
+                util.logexc(log, "Failed to run '%s' for lxd with" %
+                            dconf_comm)
+
+            # Remove the existing configuration file (forces re-generation)
+            util.del_file("/etc/default/lxd-bridge")
+
+            # Run reconfigure
+            log.debug("Running dpkg-reconfigure for lxd")
+            util.subp(['dpkg-reconfigure', 'lxd',
+                       '--frontend=noninteractive'])
+        else:
+            # Built-in LXD bridge support
+            cmd_create, cmd_attach = bridge_to_cmd(bridge_cfg)
+            if cmd_create:
+                log.debug("Creating lxd bridge: %s" %
+                          " ".join(cmd_create))
+                util.subp(cmd_create)
+
+            if cmd_attach:
+                log.debug("Setting up default lxd bridge: %s" %
+                          " ".join(cmd_create))
+                util.subp(cmd_attach)
 
-        # Update debconf database
-        try:
-            log.debug("Setting lxd debconf via " + dconf_comm)
-            data = "\n".join(["set %s %s" % (k, v)
-                              for k, v in debconf.items()]) + "\n"
-            util.subp(['debconf-communicate'], data)
-        except Exception:
-            util.logexc(log, "Failed to run '%s' for lxd with" % dconf_comm)
-
-        # Remove the existing configuration file (forces re-generation)
-        util.del_file("/etc/default/lxd-bridge")
-
-        # Run reconfigure
-        log.debug("Running dpkg-reconfigure for lxd")
-        util.subp(['dpkg-reconfigure', 'lxd',
-                   '--frontend=noninteractive'])
     elif bridge_cfg:
         raise RuntimeError(
             "Unable to configure lxd bridge without %s." + dconf_comm)
@@ -177,3 +210,55 @@ def bridge_to_debconf(bridge_cfg):
         raise Exception("invalid bridge mode \"%s\"" % bridge_cfg.get("mode"))
 
     return debconf
+
+
+def bridge_to_cmd(bridge_cfg):
+    if bridge_cfg.get("mode") == "none":
+        return None, None
+
+    bridge_name = bridge_cfg.get("name", "lxdbr0")
+    cmd_create = []
+    cmd_attach = ["lxc", "network", "attach-profile", bridge_name,
+                  "default", "eth0", "--force-local"]
+
+    if bridge_cfg.get("mode") == "existing":
+        return None, cmd_attach
+
+    if bridge_cfg.get("mode") != "new":
+        raise Exception("invalid bridge mode \"%s\"" % bridge_cfg.get("mode"))
+
+    cmd_create = ["lxc", "network", "create", bridge_name]
+
+    if bridge_cfg.get("ipv4_address") and bridge_cfg.get("ipv4_netmask"):
+        cmd_create.append("ipv4.address=%s/%s" %
+                          (bridge_cfg.get("ipv4_address"),
+                           bridge_cfg.get("ipv4_netmask")))
+
+        if bridge_cfg.get("ipv4_nat", "true") == "true":
+            cmd_create.append("ipv4.nat=true")
+
+        if bridge_cfg.get("ipv4_dhcp_first") and \
+                bridge_cfg.get("ipv4_dhcp_last"):
+            dhcp_range = "%s-%s" % (bridge_cfg.get("ipv4_dhcp_first"),
+                                    bridge_cfg.get("ipv4_dhcp_last"))
+            cmd_create.append("ipv4.dhcp.ranges=%s" % dhcp_range)
+    else:
+        cmd_create.append("ipv4.address=none")
+
+    if bridge_cfg.get("ipv6_address") and bridge_cfg.get("ipv6_netmask"):
+        cmd_create.append("ipv6.address=%s/%s" %
+                          (bridge_cfg.get("ipv6_address"),
+                           bridge_cfg.get("ipv6_netmask")))
+
+        if bridge_cfg.get("ipv6_nat", "false") == "true":
+            cmd_create.append("ipv6.nat=true")
+
+    else:
+        cmd_create.append("ipv6.address=none")
+
+    if bridge_cfg.get("domain"):
+        cmd_create.append("dns.domain=%s" % bridge_cfg.get("domain"))
+
+    cmd_create.append("--force-local")
+
+    return cmd_create, cmd_attach