Merge lp:~wesley-wiedenmeier/cloud-init/lxd-init into lp:~cloud-init-dev/cloud-init/trunk

[Scott Moser]

[Scott Moser (smoser)]

Wesley,

Thanks.

Please add a 'doc' in
 doc/examples/cloud-config-lxd.txt

like the other files there.

see inline comments

[lp:~wesley-wiedenmeier/cloud-init/lxd-init]

1159. By Wesley Wiedenmeier on 2016-02-04

Added example cc_lxd config

1160. By Wesley Wiedenmeier on 2016-02-05

 - Ensure that lxd is installed before running lxd init.
 - Handle init cfg separately from main cfg to allow multiple sections under lxd
   config to be handled independantly.
 - Check for properly formatted lxd init cfg

1161. By Wesley Wiedenmeier on 2016-02-05

Use mock in test_handler_lxd.py and add test for lxd installation

1162. By Wesley Wiedenmeier on 2016-02-05

Merge from trunk and resolve text conflict in ChangeLog

=== modified file 'ChangeLog'
--- ChangeLog	2016-02-04 22:11:13 +0000
+++ ChangeLog	2016-02-05 01:21:21 +0000
@@ -72,6 +72,7 @@
  - systemd/power_state: fix power_state to work even if cloud-final
    exited non-zero (LP: #1449318)
  - SmartOS: Add support for Joyent LX-Brand Zones (LP: #1540965)
+ - lxd: add support for setting up lxd using 'lxd init' (LP: #1522879)
    [Robert C Jennings]
  - systemd: support using systemd-detect-virt to detect container
    (LP: #1539016) [Martin Pitt]
 
=== added file 'cloudinit/config/cc_lxd.py'
--- cloudinit/config/cc_lxd.py	1970-01-01 00:00:00 +0000
+++ cloudinit/config/cc_lxd.py	2016-02-05 01:21:21 +0000
@@ -0,0 +1,66 @@
+# vi: ts=4 expandtab
+#
+#    Copyright (C) 2016 Canonical Ltd.
+#
+#    Author: Wesley Wiedenmeier <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License version 3, as
+#    published by the Free Software Foundation.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    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>
+"""
+
+from cloudinit import util
+
+
+def handle(name, cfg, cloud, log, args):
+    # Get config
+    lxd_cfg = cfg.get('lxd')
+    if not lxd_cfg and isinstance(lxd_cfg, dict):
+        log.debug("Skipping module named %s, not present or disabled by cfg")
+        return
+
+    # Ensure lxd is installed
+    if not util.which("lxd"):
+        try:
+            cloud.distro.install_packages(("lxd",))
+        except util.ProcessExecutionError as e:
+            log.warn("no lxd executable and could not install lxd: '%s'" % e)
+            return
+
+    # Set up lxd if init config is given
+    init_cfg = lxd_cfg.get('init')
+    if init_cfg:
+        if not isinstance(init_cfg, dict):
+            log.warn("lxd init config must be a dict of flag: val pairs")
+            return
+        init_keys = ('network_address', 'network_port', 'storage_backend',
+                     'storage_create_device', 'storage_create_loop',
+                     'storage_pool', 'trust_password')
+        cmd = ['lxd', 'init', '--auto']
+        for k in init_keys:
+            if init_cfg.get(k):
+                cmd.extend(["--%s" % k.replace('_', '-'), init_cfg[k]])
+        util.subp(cmd)
 
=== modified file 'config/cloud.cfg'
--- config/cloud.cfg	2015-10-09 16:39:23 +0000
+++ config/cloud.cfg	2016-02-05 01:21:21 +0000
@@ -56,6 +56,7 @@
  - fan
  - landscape
  - timezone
+ - lxd
  - puppet
  - chef
  - salt-minion
 
=== added file 'doc/examples/cloud-config-lxd.txt'
--- doc/examples/cloud-config-lxd.txt	1970-01-01 00:00:00 +0000
+++ doc/examples/cloud-config-lxd.txt	2016-02-05 01:21:21 +0000
@@ -0,0 +1,21 @@
+#cloud-config
+
+# configure lxd
+# default: none
+# all options default to none if not specified
+# lxd: config sections for lxd
+#   init: dict of options for lxd init, see 'man lxd'
+#     network_address: address for lxd to listen on
+#     network_port: port for lxd to listen on
+#     storage_backend: either 'zfs' or 'dir'
+#     storage_create_device: device based storage using specified device
+#     storage_create_loop: set up loop based storage with size in GB
+#     storage_pool: name of storage pool to use or create
+#     trust_password: password required to add new clients
+
+lxd:
+  init:
+    network_address: 0.0.0.0
+    network_port: 8443
+    storage_backend: zfs
+    storage_pool: datapool
 
=== added file 'tests/unittests/test_handler/test_handler_lxd.py'
--- tests/unittests/test_handler/test_handler_lxd.py	1970-01-01 00:00:00 +0000
+++ tests/unittests/test_handler/test_handler_lxd.py	2016-02-05 01:21:21 +0000
@@ -0,0 +1,58 @@
+from cloudinit.config import cc_lxd
+from cloudinit import (distros, helpers, cloud)
+from cloudinit.sources import DataSourceNoCloud
+from .. import helpers as t_help
+
+import logging
+
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+
+LOG = logging.getLogger(__name__)
+
+
+class TestLxd(t_help.TestCase):
+    lxd_cfg = {
+        'lxd': {
+            'init': {
+                'network_address': '0.0.0.0',
+                'storage_backend': 'zfs',
+                'storage_pool': 'poolname',
+            }
+        }
+    }
+
+    def setUp(self):
+        super(TestLxd, self).setUp()
+
+    def _get_cloud(self, distro):
+        cls = distros.fetch(distro)
+        paths = helpers.Paths({})
+        d = cls(distro, {}, paths)
+        ds = DataSourceNoCloud.DataSourceNoCloud({}, d, paths)
+        cc = cloud.Cloud(ds, paths, {}, d, None)
+        return cc
+
+    @mock.patch("cloudinit.config.cc_lxd.util")
+    def test_lxd_init(self, mock_util):
+        cc = self._get_cloud('ubuntu')
+        mock_util.which.return_value = True
+        cc_lxd.handle('cc_lxd', self.lxd_cfg, cc, LOG, [])
+        self.assertTrue(mock_util.which.called)
+        init_call = mock_util.subp.call_args_list[0][0][0]
+        self.assertEquals(init_call,
+                          ['lxd', 'init', '--auto', '--network-address',
+                           '0.0.0.0', '--storage-backend', 'zfs',
+                           '--storage-pool', 'poolname'])
+
+    @mock.patch("cloudinit.config.cc_lxd.util")
+    def test_lxd_install(self, mock_util):
+        cc = self._get_cloud('ubuntu')
+        cc.distro = mock.MagicMock()
+        mock_util.which.return_value = None
+        cc_lxd.handle('cc_lxd', self.lxd_cfg, cc, LOG, [])
+        self.assertTrue(cc.distro.install_packages.called)
+        install_pkg = cc.distro.install_packages.call_args_list[0][0][0]
+        self.assertEquals(install_pkg, ('lxd',))