T2117: Cloud-init updated to 22.1

Merged with 22.1 tag from the upstream Cloud-init repository.

Our modules were slightly modified for compatibility with the new
version.

1 files changed, 0 insertions, 30 deletions

diff --git a/tests/cloud_tests/testcases/modules/lxd_dir.py b/tests/cloud_tests/testcases/modules/lxd_dir.py
deleted file mode 100644
index 797bafed..00000000
--- a/tests/cloud_tests/testcases/modules/lxd_dir.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file is part of cloud-init. See LICENSE file for license information.
-
-"""cloud-init Integration Test Verify Script."""
-from tests.cloud_tests.testcases import base
-
-
-class TestLxdDir(base.CloudTestCase):
-    """Test LXD module."""
-
-    @classmethod
-    def maybeSkipTest(cls):
-        """Skip on cosmic for two reasons:
-        a.) LP: #1795036 - 'lxd init' fails on cosmic kernel.
-        b.) apt install lxd installs via snap which can be slow
-            as that will download core snap and lxd."""
-        os_name = cls.data.get('os_name', 'UNKNOWN')
-        if os_name == "cosmic":
-            raise base.SkipTest('Skipping test on cosmic (LP: #1795036).')
-
-    def test_lxd(self):
-        """Test lxd installed."""
-        out = self.get_data_file('lxd')
-        self.assertIn('/lxd', out)
-
-    def test_lxc(self):
-        """Test lxc installed."""
-        out = self.get_data_file('lxc')
-        self.assertIn('/lxc', out)
-
-# vi: ts=4 expandtab