summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnson Shi <johnson@johnsonshi.com>2019-01-25 17:46:33 +0000
committerServer Team CI Bot <josh.powers+server-team-bot@canonical.com>2019-01-25 17:46:33 +0000
commitc283321bb118d5408390e12b173440f57bd2c160 (patch)
treec77ddee814462b2b6b36e761560a1d0bf7a2b1d6
parentb74ebca563a21332b29482c8029e7908f60225a4 (diff)
downloadvyos-cloud-init-c283321bb118d5408390e12b173440f57bd2c160.tar.gz
vyos-cloud-init-c283321bb118d5408390e12b173440f57bd2c160.zip
lxd: install zfs-linux instead of zfs meta package
When using the LXD module cloud-init will attempt to install ZFS if it does not exist on the target system. However instead of installing the `zfsutils-linux` package it attempts to install `zfs` resulting in an error. Ubuntu Xenial (16.04) has zfs meta package, but Bionic (18.04) does not. Use the specific base package instead of zfs meta. Co-authored-by: Michael Skalka <michael.skalka@canonical.com> LP: #1799779
-rw-r--r--cloudinit/config/cc_lxd.py2
-rw-r--r--tests/unittests/test_handler/test_handler_lxd.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/config/cc_lxd.py b/cloudinit/config/cc_lxd.py
index 24a8ebea..71d13ed8 100644
--- a/cloudinit/config/cc_lxd.py
+++ b/cloudinit/config/cc_lxd.py
@@ -89,7 +89,7 @@ def handle(name, cfg, cloud, log, args):
packages.append('lxd')
if init_cfg.get("storage_backend") == "zfs" and not util.which('zfs'):
- packages.append('zfs')
+ packages.append('zfsutils-linux')
if len(packages):
try:
diff --git a/tests/unittests/test_handler/test_handler_lxd.py b/tests/unittests/test_handler/test_handler_lxd.py
index 2478ebc4..b63db616 100644
--- a/tests/unittests/test_handler/test_handler_lxd.py
+++ b/tests/unittests/test_handler/test_handler_lxd.py
@@ -62,7 +62,7 @@ class TestLxd(t_help.CiTestCase):
cc_lxd.handle('cc_lxd', self.lxd_cfg, cc, self.logger, [])
self.assertFalse(m_maybe_clean.called)
install_pkg = cc.distro.install_packages.call_args_list[0][0][0]
- self.assertEqual(sorted(install_pkg), ['lxd', 'zfs'])
+ self.assertEqual(sorted(install_pkg), ['lxd', 'zfsutils-linux'])
@mock.patch("cloudinit.config.cc_lxd.maybe_cleanup_default")
@mock.patch("cloudinit.config.cc_lxd.util")