Merge pull request #51 from zdc/T2117-sagitta-22.1

T2117: Cloud-init updated to 22.1

132 files changed, 0 insertions, 3776 deletions

diff --git a/tests/cloud_tests/testcases/__init__.py b/tests/cloud_tests/testcases/__init__.py
deleted file mode 100644
index bb9785d3..00000000
--- a/tests/cloud_tests/testcases/__init__.py
+++ /dev/null
@@ -1,73 +0,0 @@
-# This file is part of cloud-init. See LICENSE file for license information.
-
-"""Main init."""
-
-import importlib
-import inspect
-import unittest
-
-from cloudinit.util import read_conf
-
-from tests.cloud_tests import config
-from tests.cloud_tests.testcases.base import CloudTestCase as base_test
-
-
-def discover_test(test_name):
-    """Discover tests in test file for 'testname'.
-
-    @return_value: list of test classes
-    """
-    testmod_name = 'tests.cloud_tests.testcases.{}'.format(
-        config.name_sanitize(test_name))
-    try:
-        testmod = importlib.import_module(testmod_name)
-    except NameError as e:
-        raise ValueError(
-            'no test verifier found at: {}'.format(testmod_name)
-        ) from e
-
-    found = [mod for name, mod in inspect.getmembers(testmod)
-             if (inspect.isclass(mod)
-                 and base_test in inspect.getmro(mod)
-                 and getattr(mod, '__test__', True))]
-    if len(found) != 1:
-        raise RuntimeError(
-            "Unexpected situation, multiple tests for %s: %s" % (
-                test_name, found))
-
-    return found
-
-
-def get_test_class(test_name, test_data, test_conf):
-    test_class = discover_test(test_name)[0]
-
-    class DynamicTestSubclass(test_class):
-
-        _realclass = test_class
-        data = test_data
-        conf = test_conf
-        release_conf = read_conf(config.RELEASES_CONF)['releases']
-
-        def __str__(self):
-            return "%s (%s)" % (self._testMethodName,
-                                unittest.util.strclass(self._realclass))
-
-        @classmethod
-        def setUpClass(cls):
-            cls.maybeSkipTest()
-
-    return DynamicTestSubclass
-
-
-def get_suite(test_name, data, conf):
-    """Get test suite with all tests for 'testname'.
-
-    @return_value: a test suite
-    """
-    suite = unittest.TestSuite()
-    suite.addTest(
-        unittest.defaultTestLoader.loadTestsFromTestCase(
-            get_test_class(test_name, data, conf)))
-    return suite
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/base.py b/tests/cloud_tests/testcases/base.py
deleted file mode 100644
index 4448e0b5..00000000
--- a/tests/cloud_tests/testcases/base.py
+++ /dev/null
@@ -1,385 +0,0 @@
-# This file is part of cloud-init. See LICENSE file for license information.
-
-"""Base test case module."""
-
-import crypt
-import json
-import re
-import unittest
-
-
-from cloudinit import util as c_util
-
-SkipTest = unittest.SkipTest
-
-
-class CloudTestCase(unittest.TestCase):
-    """Base test class for verifiers."""
-
-    # data gets populated in get_suite.setUpClass
-    data = {}
-    conf = None
-    _cloud_config = None
-    release_conf = {}    # The platform's os release configuration
-
-    expected_warnings = ()  # Subclasses set to ignore expected WARN logs
-
-    @property
-    def os_cfg(self):
-        return self.release_conf[self.os_name]['default']
-
-    def is_distro(self, distro_name):
-        return self.os_cfg['os'] == distro_name
-
-    @classmethod
-    def maybeSkipTest(cls):
-        """Present to allow subclasses to override and raise a skipTest."""
-
-    def assertPackageInstalled(self, name, version=None):
-        """Check dpkg-query --show output for matching package name.
-
-        @param name: package base name
-        @param version: string representing a package version or part of a
-            version.
-        """
-        pkg_out = self.get_data_file('package-versions')
-        pkg_match = re.search(
-            '^%s\t(?P<version>.*)$' % name, pkg_out, re.MULTILINE)
-        if pkg_match:
-            installed_version = pkg_match.group('version')
-            if not version:
-                return  # Success
-            if installed_version.startswith(version):
-                return  # Success
-            raise AssertionError(
-                'Expected package version %s-%s not found. Found %s' %
-                name, version, installed_version)
-        raise AssertionError('Package not installed: %s' % name)
-
-    def os_version_cmp(self, cmp_version):
-        """Compare the version of the test to comparison_version.
-
-        @param: cmp_version: Either a float or a string representing
-           a release os from releases.yaml (e.g. centos66)
-
-        @return: -1 when version < cmp_version, 0 when version=cmp_version and
-            1 when version > cmp_version.
-        """
-        version = self.release_conf[self.os_name]['default']['version']
-        if isinstance(cmp_version, str):
-            cmp_version = self.release_conf[cmp_version]['default']['version']
-        if version < cmp_version:
-            return -1
-        elif version == cmp_version:
-            return 0
-        else:
-            return 1
-
-    @property
-    def os_name(self):
-        return self.data.get('os_name', 'UNKNOWN')
-
-    @property
-    def platform(self):
-        return self.data.get('platform', 'UNKNOWN')
-
-    @property
-    def cloud_config(self):
-        """Get the cloud-config used by the test."""
-        if not self._cloud_config:
-            self._cloud_config = c_util.load_yaml(self.conf)
-        return self._cloud_config
-
-    def get_config_entry(self, name):
-        """Get a config entry from cloud-config ensuring that it is present."""
-        if name not in self.cloud_config:
-            raise AssertionError('Key "{}" not in cloud config'.format(name))
-        return self.cloud_config[name]
-
-    def get_data_file(self, name, decode=True):
-        """Get data file failing test if it is not present."""
-        if name not in self.data:
-            raise AssertionError('File "{}" missing from collect data'
-                                 .format(name))
-        if not decode:
-            return self.data[name]
-        return self.data[name].decode('utf-8')
-
-    def get_instance_id(self):
-        """Get recorded instance id."""
-        return self.get_data_file('instance-id').strip()
-
-    def get_status_data(self, data, version=None):
-        """Parse result.json and status.json like data files.
-
-        @param data: data to load
-        @param version: cloud-init output version, defaults to 'v1'
-        @return_value: dict of data or None if missing
-        """
-        if not version:
-            version = 'v1'
-        data = json.loads(data)
-        return data.get(version)
-
-    def get_datasource(self):
-        """Get datasource name."""
-        data = self.get_status_data(self.get_data_file('result.json'))
-        return data.get('datasource')
-
-    def test_no_stages_errors(self):
-        """Ensure that there were no errors in any stage."""
-        status = self.get_status_data(self.get_data_file('status.json'))
-        for stage in ('init', 'init-local', 'modules-config', 'modules-final'):
-            self.assertIn(stage, status)
-            self.assertEqual(len(status[stage]['errors']), 0,
-                             'errors {} were encountered in stage {}'
-                             .format(status[stage]['errors'], stage))
-        result = self.get_status_data(self.get_data_file('result.json'))
-        self.assertEqual(len(result['errors']), 0)
-
-    def test_no_warnings_in_log(self):
-        """Unexpected warnings should not be found in the log."""
-        warnings = [
-            line for line in self.get_data_file('cloud-init.log').splitlines()
-            if 'WARN' in line]
-        joined_warnings = '\n'.join(warnings)
-        for expected_warning in self.expected_warnings:
-            self.assertIn(
-                expected_warning, joined_warnings,
-                msg="Did not find %s in cloud-init.log" % expected_warning)
-            # Prune expected from discovered warnings
-            warnings = [w for w in warnings if expected_warning not in w]
-        self.assertEqual(
-            [], warnings, msg="'WARN' found inside cloud-init.log")
-
-    def test_instance_data_json_ec2(self):
-        """Validate instance-data.json content by ec2 platform.
-
-        This content is sourced by snapd when determining snapstore endpoints.
-        We validate expected values per cloud type to ensure we don't break
-        snapd.
-        """
-        if self.platform != 'ec2':
-            raise SkipTest(
-                'Skipping ec2 instance-data.json on %s' % self.platform)
-        out = self.get_data_file('instance-data.json')
-        if not out:
-            if self.is_distro('ubuntu') and self.os_version_cmp('bionic') >= 0:
-                raise AssertionError(
-                    'No instance-data.json found on %s' % self.os_name)
-            raise SkipTest(
-                'Skipping instance-data.json test.'
-                ' OS: %s not bionic or newer' % self.os_name)
-        instance_data = json.loads(out)
-        self.assertCountEqual(['merged_cfg'], instance_data['sensitive_keys'])
-        ds = instance_data.get('ds', {})
-        v1_data = instance_data.get('v1', {})
-        metadata = ds.get('meta-data', {})
-        macs = metadata.get(
-            'network', {}).get('interfaces', {}).get('macs', {})
-        if not macs:
-            raise AssertionError('No network data from EC2 meta-data')
-        # Check meta-data items we depend on
-        expected_net_keys = [
-            'public-ipv4s', 'ipv4-associations', 'local-hostname',
-            'public-hostname']
-        for mac_data in macs.values():
-            for key in expected_net_keys:
-                self.assertIn(key, mac_data)
-        self.assertIsNotNone(
-            metadata.get('placement', {}).get('availability-zone'),
-            'Could not determine EC2 Availability zone placement')
-        self.assertIsNotNone(
-            v1_data['availability_zone'], 'expected ec2 availability_zone')
-        self.assertEqual('aws', v1_data['cloud_name'])
-        self.assertEqual('ec2', v1_data['platform'])
-        self.assertEqual(
-            'metadata (http://169.254.169.254)', v1_data['subplatform'])
-        self.assertIn('i-', v1_data['instance_id'])
-        self.assertIn('ip-', v1_data['local_hostname'])
-        self.assertIsNotNone(v1_data['region'], 'expected ec2 region')
-        self.assertIsNotNone(
-            re.match(r'\d\.\d+\.\d+-\d+-aws', v1_data['kernel_release']))
-        self.assertEqual(
-            'redacted for non-root user', instance_data['merged_cfg'])
-        self.assertEqual(self.os_cfg['os'], v1_data['variant'])
-        self.assertEqual(self.os_cfg['os'], v1_data['distro'])
-        self.assertEqual(
-            self.os_cfg['os'], instance_data["sys_info"]['dist'][0],
-            "Unexpected sys_info dist value")
-        self.assertEqual(self.os_name, v1_data['distro_release'])
-        self.assertEqual(
-            str(self.os_cfg['version']), v1_data['distro_version'])
-        self.assertEqual('x86_64', v1_data['machine'])
-        self.assertIsNotNone(
-            re.match(r'3.\d\.\d', v1_data['python_version']),
-            "unexpected python version: {ver}".format(
-                ver=v1_data["python_version"]))
-
-    def test_instance_data_json_lxd(self):
-        """Validate instance-data.json content by lxd platform.
-
-        This content is sourced by snapd when determining snapstore endpoints.
-        We validate expected values per cloud type to ensure we don't break
-        snapd.
-        """
-        if self.platform != 'lxd':
-            raise SkipTest(
-                'Skipping lxd instance-data.json on %s' % self.platform)
-        out = self.get_data_file('instance-data.json')
-        if not out:
-            if self.is_distro('ubuntu') and self.os_version_cmp('bionic') >= 0:
-                raise AssertionError(
-                    'No instance-data.json found on %s' % self.os_name)
-            raise SkipTest(
-                'Skipping instance-data.json test.'
-                ' OS: %s not bionic or newer' % self.os_name)
-        instance_data = json.loads(out)
-        v1_data = instance_data.get('v1', {})
-        self.assertCountEqual([], sorted(instance_data['base64_encoded_keys']))
-        self.assertEqual('unknown', v1_data['cloud_name'])
-        self.assertEqual('lxd', v1_data['platform'])
-        self.assertEqual(
-            'seed-dir (/var/lib/cloud/seed/nocloud-net)',
-            v1_data['subplatform'])
-        self.assertIsNone(
-            v1_data['availability_zone'],
-            'found unexpected lxd availability_zone %s' %
-            v1_data['availability_zone'])
-        self.assertIn('cloud-test', v1_data['instance_id'])
-        self.assertIn('cloud-test', v1_data['local_hostname'])
-        self.assertIsNone(
-            v1_data['region'],
-            'found unexpected lxd region %s' % v1_data['region'])
-        self.assertIsNotNone(
-            re.match(r'\d\.\d+\.\d+-\d+', v1_data['kernel_release']))
-        self.assertEqual(
-            'redacted for non-root user', instance_data['merged_cfg'])
-        self.assertEqual(self.os_cfg['os'], v1_data['variant'])
-        self.assertEqual(self.os_cfg['os'], v1_data['distro'])
-        self.assertEqual(
-            self.os_cfg['os'], instance_data["sys_info"]['dist'][0],
-            "Unexpected sys_info dist value")
-        self.assertEqual(self.os_name, v1_data['distro_release'])
-        self.assertEqual(
-            str(self.os_cfg['version']), v1_data['distro_version'])
-        self.assertEqual('x86_64', v1_data['machine'])
-        self.assertIsNotNone(
-            re.match(r'3.\d\.\d', v1_data['python_version']),
-            "unexpected python version: {ver}".format(
-                ver=v1_data["python_version"]))
-
-    def test_instance_data_json_kvm(self):
-        """Validate instance-data.json content by nocloud-kvm platform.
-
-        This content is sourced by snapd when determining snapstore endpoints.
-        We validate expected values per cloud type to ensure we don't break
-        snapd.
-        """
-        if self.platform != 'nocloud-kvm':
-            raise SkipTest(
-                'Skipping nocloud-kvm instance-data.json on %s' %
-                self.platform)
-        out = self.get_data_file('instance-data.json')
-        if not out:
-            if self.is_distro('ubuntu') and self.os_version_cmp('bionic') >= 0:
-                raise AssertionError(
-                    'No instance-data.json found on %s' % self.os_name)
-            raise SkipTest(
-                'Skipping instance-data.json test.'
-                ' OS: %s not bionic or newer' % self.os_name)
-        instance_data = json.loads(out)
-        v1_data = instance_data.get('v1', {})
-        self.assertCountEqual([], instance_data['base64_encoded_keys'])
-        self.assertEqual('unknown', v1_data['cloud_name'])
-        self.assertEqual('nocloud', v1_data['platform'])
-        subplatform = v1_data['subplatform']
-        self.assertIsNotNone(
-            re.match(r'config-disk \(\/dev\/[a-z]{3}\)', subplatform),
-            'kvm subplatform "%s" != "config-disk (/dev/...)"' % subplatform)
-        self.assertIsNone(
-            v1_data['availability_zone'],
-            'found unexpected kvm availability_zone %s' %
-            v1_data['availability_zone'])
-        self.assertIsNotNone(
-            re.match(r'[\da-f]{8}(-[\da-f]{4}){3}-[\da-f]{12}',
-                     v1_data['instance_id']),
-            'kvm instance_id is not a UUID: %s' % v1_data['instance_id'])
-        self.assertIn('ubuntu', v1_data['local_hostname'])
-        self.assertIsNone(
-            v1_data['region'],
-            'found unexpected lxd region %s' % v1_data['region'])
-        self.assertIsNotNone(
-            re.match(r'\d\.\d+\.\d+-\d+', v1_data['kernel_release']))
-        self.assertEqual(
-            'redacted for non-root user', instance_data['merged_cfg'])
-        self.assertEqual(self.os_cfg['os'], v1_data['variant'])
-        self.assertEqual(self.os_cfg['os'], v1_data['distro'])
-        self.assertEqual(
-            self.os_cfg['os'], instance_data["sys_info"]['dist'][0],
-            "Unexpected sys_info dist value")
-        self.assertEqual(self.os_name, v1_data['distro_release'])
-        self.assertEqual(
-            str(self.os_cfg['version']), v1_data['distro_version'])
-        self.assertEqual('x86_64', v1_data['machine'])
-        self.assertIsNotNone(
-            re.match(r'3.\d\.\d', v1_data['python_version']),
-            "unexpected python version: {ver}".format(
-                ver=v1_data["python_version"]))
-
-
-class PasswordListTest(CloudTestCase):
-    """Base password test case class."""
-
-    def test_shadow_passwords(self):
-        """Test shadow passwords."""
-        shadow = self.get_data_file('shadow')
-        users = {}
-        dupes = []
-        for line in shadow.splitlines():
-            user, encpw = line.split(":")[0:2]
-            if user in users:
-                dupes.append(user)
-            users[user] = encpw
-
-        jane_enc = "$5$iW$XsxmWCdpwIW8Yhv.Jn/R3uk6A4UaicfW5Xp7C9p9pg."
-        self.assertEqual([], dupes)
-        self.assertEqual(jane_enc, users['jane'])
-
-        mikey_enc = "$5$xZ$B2YGGEx2AOf4PeW48KC6.QyT1W2B4rZ9Qbltudtha89"
-        self.assertEqual(mikey_enc, users['mikey'])
-
-        # shadow entry is $N$salt$, so we encrypt with the same format
-        # and salt and expect the result.
-        tom = "mypassword123!"
-        fmtsalt = users['tom'][0:users['tom'].rfind("$") + 1]
-        tom_enc = crypt.crypt(tom, fmtsalt)
-        self.assertEqual(tom_enc, users['tom'])
-
-        harry_enc = ("$6$LF$9Z2p6rWK6TNC1DC6393ec0As.18KRAvKDbfsG"
-                     "JEdWN3sRQRwpdfoh37EQ3yUh69tP4GSrGW5XKHxMLiKowJgm/")
-        dick_enc = "$1$ssisyfpf$YqvuJLfrrW6Cg/l53Pi1n1"
-
-        # these should have been changed to random values.
-        self.assertNotEqual(harry_enc, users['harry'])
-        self.assertTrue(users['harry'].startswith("$"))
-        self.assertNotEqual(dick_enc, users['dick'])
-        self.assertTrue(users['dick'].startswith("$"))
-
-        self.assertNotEqual(users['harry'], users['dick'])
-
-    def test_shadow_expected_users(self):
-        """Test every tom, dick, and harry user in shadow."""
-        out = self.get_data_file('shadow')
-        self.assertIn('tom:', out)
-        self.assertIn('dick:', out)
-        self.assertIn('harry:', out)
-        self.assertIn('jane:', out)
-        self.assertIn('mikey:', out)
-
-    def test_sshd_config(self):
-        """Test sshd config allows passwords."""
-        out = self.get_data_file('sshd_config')
-        self.assertIn('PasswordAuthentication yes', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/bugs/README.md b/tests/cloud_tests/testcases/bugs/README.md
deleted file mode 100644
index 09ce0765..00000000
--- a/tests/cloud_tests/testcases/bugs/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Bug Test Configs
-
-## purpose
-Configs that reproduce bugs filed against cloud-init. Having test configs for
-cloud-init bugs ensures that the fixes do not break in the future, and makes it
-easy to see how many systems and platforms are effected by a new bug.
-
-## structure
-Should have one test config for most bugs filed. The name of the test should
-contain ``lp`` followed by the bug number. It may also be useful to add a
-comment to each bug config with a summary copied from the bug report.
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/bugs/__init__.py b/tests/cloud_tests/testcases/bugs/__init__.py
deleted file mode 100644
index c6452f9c..00000000
--- a/tests/cloud_tests/testcases/bugs/__init__.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# This file is part of cloud-init. See LICENSE file for license information.
-
-"""Test verifiers for cloud-init bugs.
-
-See configs/bugs/README.md for more information
-"""
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/bugs/lp1511485.py b/tests/cloud_tests/testcases/bugs/lp1511485.py
deleted file mode 100644
index 670d3aff..00000000
--- a/tests/cloud_tests/testcases/bugs/lp1511485.py
+++ /dev/null
@@ -1,15 +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 TestLP1511485(base.CloudTestCase):
-    """Test LP# 1511485."""
-
-    def test_final_message(self):
-        """Test final message exists."""
-        out = self.get_data_file('cloud-init-output.log')
-        self.assertIn('Final message from cloud-config', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/bugs/lp1511485.yaml b/tests/cloud_tests/testcases/bugs/lp1511485.yaml
deleted file mode 100644
index ebf9763f..00000000
--- a/tests/cloud_tests/testcases/bugs/lp1511485.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# LP Bug 1511485: final_message is silent on ubuntu-12.04.5 / cloud-init 0.6.3
-#
-# 2016-11-17: Disabled as covered by module based tests
-#
-enabled: False
-cloud_config: |
-  #cloud-config
-  final_message: "Final message from cloud-config"
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/bugs/lp1611074.yaml b/tests/cloud_tests/testcases/bugs/lp1611074.yaml
deleted file mode 100644
index 960679d5..00000000
--- a/tests/cloud_tests/testcases/bugs/lp1611074.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# LP Bug 1611074: Reformatting of ephemeral drive fails on resize of Azure VM
-#
-# 2016-11-18: Disabled until test written
-#
-enabled: False
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/bugs/lp1628337.py b/tests/cloud_tests/testcases/bugs/lp1628337.py
deleted file mode 100644
index a2c90481..00000000
--- a/tests/cloud_tests/testcases/bugs/lp1628337.py
+++ /dev/null
@@ -1,23 +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 TestLP1628337(base.CloudTestCase):
-    """Test LP# 1511485."""
-
-    def test_fetch_indices(self):
-        """Verify no apt errors."""
-        out = self.get_data_file('cloud-init-output.log')
-        self.assertNotIn('W: Failed to fetch', out)
-        self.assertNotIn('W: Some index files failed to download. '
-                         'They have been ignored, or old ones used instead.',
-                         out)
-
-    def test_ntp(self):
-        """Verify can find ntp and install it."""
-        out = self.get_data_file('cloud-init-output.log')
-        self.assertNotIn('E: Unable to locate package ntp', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/bugs/lp1628337.yaml b/tests/cloud_tests/testcases/bugs/lp1628337.yaml
deleted file mode 100644
index e39b3cd8..00000000
--- a/tests/cloud_tests/testcases/bugs/lp1628337.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# LP Bug 1628337: cloud-init tries to install NTP before even configuring the archives
-#
-required_features:
-  - apt
-  - lsb_release
-cloud_config: |
-  #cloud-config
-  ntp:
-    servers: ['ntp.ubuntu.com']
-  apt:
-    primary:
-      - arches: [default]
-        uri: http://us.archive.ubuntu.com/ubuntu/
-collect_sciprts:
-  ntp.conf: |
-    #!/bin/bash
-    cat /etc/ntp.conf
-  sources.list: |
-    #!/bin/bash
-    cat /etc/apt/sources.list
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/examples/README.md b/tests/cloud_tests/testcases/examples/README.md
deleted file mode 100644
index 110a223b..00000000
--- a/tests/cloud_tests/testcases/examples/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Example Test Configs
-
-## Purpose
-This folder contains example cloud configs found on
-[cloudinit.readthedocs.io](https://cloudinit.readthedocs.io/en/latest/topics/examples.html).
-Examples covered by other tests, like modules, are excluded from tests here
-to prevent duplication and reduce test time.
-
-## Structure
-One test per example test config on cloudinit.readthedocs.io
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/examples/TODO.md b/tests/cloud_tests/testcases/examples/TODO.md
deleted file mode 100644
index 8db0e98e..00000000
--- a/tests/cloud_tests/testcases/examples/TODO.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Missing Examples
-
-Below lists each of the issing examples and why it is not currently added.
-
- - Chef (takes > 60 seconds to run)
- - Puppet (takes > 60 seconds to run)
- - Manage resolve.conf (lxd backend overrides changes)
- - Adding a yum repository (need centos system)
- - Register RedHat Subscription (need centos system + subscription)
- - Adjust mount points mounted (need multiple disks)
- - Call a url when finished (need end point)
- - Reboot/poweroff when finished (how to test)
- - Disk setup (need multiple disks)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/examples/__init__.py b/tests/cloud_tests/testcases/examples/__init__.py
deleted file mode 100644
index 39af88c2..00000000
--- a/tests/cloud_tests/testcases/examples/__init__.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# This file is part of cloud-init. See LICENSE file for license information.
-
-"""Test verifiers for cloud-init examples.
-
-See configs/examples/README.md for more information
-"""
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/examples/add_apt_repositories.py b/tests/cloud_tests/testcases/examples/add_apt_repositories.py
deleted file mode 100644
index 71eede97..00000000
--- a/tests/cloud_tests/testcases/examples/add_apt_repositories.py
+++ /dev/null
@@ -1,20 +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 TestAptconfigurePrimary(base.CloudTestCase):
-    """Example cloud-config test."""
-
-    def test_ubuntu_sources(self):
-        """Test no default Ubuntu entries exist."""
-        out = self.get_data_file('ubuntu.sources.list')
-        self.assertEqual(0, int(out))
-
-    def test_gatech_sources(self):
-        """Test GaTech entires exist."""
-        out = self.get_data_file('gatech.sources.list')
-        self.assertEqual(20, int(out))
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/examples/add_apt_repositories.yaml b/tests/cloud_tests/testcases/examples/add_apt_repositories.yaml
deleted file mode 100644
index 4b8575f7..00000000
--- a/tests/cloud_tests/testcases/examples/add_apt_repositories.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# From cloud config examples on cloudinit.readthedocs.io
-#
-# 2016-11-17: Disabled as covered by module based tests
-#
-enabled: False
-required_features:
-  - apt
-cloud_config: |
-  #cloud-config
-  apt:
-    primary:
-      - arches: [default]
-        uri: "http://www.gtlib.gatech.edu/pub/ubuntu-releases/"
-collect_scripts:
-  ubuntu.sources.list: |
-    #!/bin/bash
-    cat /etc/apt/sources.list | grep -v '^#' | sed '/^\s*$/d' | grep archive.ubuntu.com | wc -l
-  gatech.sources.list: |
-    #!/bin/bash
-    cat /etc/apt/sources.list | grep -v '^#' | sed '/^\s*$/d' | grep gtlib.gatech.edu | wc -l
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/examples/alter_completion_message.py b/tests/cloud_tests/testcases/examples/alter_completion_message.py
deleted file mode 100644
index b7b5d5e0..00000000
--- a/tests/cloud_tests/testcases/examples/alter_completion_message.py
+++ /dev/null
@@ -1,40 +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 TestFinalMessage(base.CloudTestCase):
-    """Test cloud init module `cc_final_message`."""
-
-    subs_char = '$'
-
-    def get_final_message_config(self):
-        """Get config for final message."""
-        self.assertIn('final_message', self.cloud_config)
-        return self.cloud_config['final_message']
-
-    def get_final_message(self):
-        """Get final message from log."""
-        out = self.get_data_file('cloud-init-output.log')
-        lines = len(self.get_final_message_config().splitlines())
-        return '\n'.join(out.splitlines()[-1 * lines:])
-
-    def test_final_message_string(self):
-        """Ensure final handles regular strings."""
-        for actual, config in zip(
-                self.get_final_message().splitlines(),
-                self.get_final_message_config().splitlines()):
-            if self.subs_char not in config:
-                self.assertEqual(actual, config)
-
-    def test_final_message_subs(self):
-        """Test variable substitution in final message."""
-        # TODO: add verification of other substitutions
-        patterns = {'$datasource': self.get_datasource()}
-        for key, expected in patterns.items():
-            index = self.get_final_message_config().splitlines().index(key)
-            actual = self.get_final_message().splitlines()[index]
-            self.assertEqual(actual, expected)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/examples/alter_completion_message.yaml b/tests/cloud_tests/testcases/examples/alter_completion_message.yaml
deleted file mode 100644
index 9e154f80..00000000
--- a/tests/cloud_tests/testcases/examples/alter_completion_message.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# From cloud config examples on cloudinit.readthedocs.io
-#
-# 2016-11-17: Disabled as covered by module based tests
-#
-enabled: False
-cloud_config: |
-  #cloud-config
-  final_message: |
-    This is my final message!
-    $version
-    $timestamp
-    $datasource
-    $uptime
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/examples/configure_instance_trusted_ca_certificates.py b/tests/cloud_tests/testcases/examples/configure_instance_trusted_ca_certificates.py
deleted file mode 100644
index 38540eb8..00000000
--- a/tests/cloud_tests/testcases/examples/configure_instance_trusted_ca_certificates.py
+++ /dev/null
@@ -1,27 +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 TestTrustedCA(base.CloudTestCase):
-    """Example cloud-config test."""
-
-    def test_cert_count_ca(self):
-        """Test correct count of CAs in .crt."""
-        out = self.get_data_file('cert_count_ca')
-        self.assertIn('7 /etc/ssl/certs/ca-certificates.crt', out)
-
-    def test_cert_count_cloudinit(self):
-        """Test correct count of CAs in .pem."""
-        out = self.get_data_file('cert_count_cloudinit')
-        self.assertIn('7 /etc/ssl/certs/cloud-init-ca-certs.pem', out)
-
-    def test_cloudinit_certs(self):
-        """Test text of cert."""
-        out = self.get_data_file('cloudinit_certs')
-        self.assertIn('-----BEGIN CERTIFICATE-----', out)
-        self.assertIn('YOUR-ORGS-TRUSTED-CA-CERT-HERE', out)
-        self.assertIn('-----END CERTIFICATE-----', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/examples/configure_instance_trusted_ca_certificates.yaml b/tests/cloud_tests/testcases/examples/configure_instance_trusted_ca_certificates.yaml
deleted file mode 100644
index ad32b088..00000000
--- a/tests/cloud_tests/testcases/examples/configure_instance_trusted_ca_certificates.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# From cloud config examples on cloudinit.readthedocs.io
-#
-# 2016-11-17: Disabled as covered by module based tests
-#
-enabled: False
-cloud_config: |
-  #cloud-config
-    ca-certs:
-      # If present and set to True, the 'remove-defaults' parameter will remove
-      # all the default trusted CA certificates that are normally shipped with
-      # Ubuntu.
-      # This is mainly for paranoid admins - most users will not need this
-      # functionality.
-      remove-defaults: true
-
-      # If present, the 'trusted' parameter should contain a certificate (or list
-      # of certificates) to add to the system as trusted CA certificates.
-      # Pay close attention to the YAML multiline list syntax.  The example shown
-      # here is for a list of multiline certificates.
-      trusted:
-      - |
-       -----BEGIN CERTIFICATE-----
-       YOUR-ORGS-TRUSTED-CA-CERT-HERE
-       -----END CERTIFICATE-----
-      - |
-       -----BEGIN CERTIFICATE-----
-       YOUR-ORGS-TRUSTED-CA-CERT-HERE
-       -----END CERTIFICATE-----
-collect_scripts:
-  cloudinit_certs: |
-    #!/bin/bash
-    cat /etc/ssl/certs/cloud-init-ca-certs.pem
-  cert_count_ca: |
-    #!/bin/bash
-    wc -l /etc/ssl/certs/ca-certificates.crt
-  cert_count_cloudinit: |
-    #!/bin/bash
-    wc -l /etc/ssl/certs/cloud-init-ca-certs.pem
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/examples/configure_instances_ssh_keys.py b/tests/cloud_tests/testcases/examples/configure_instances_ssh_keys.py
deleted file mode 100644
index 691a316b..00000000
--- a/tests/cloud_tests/testcases/examples/configure_instances_ssh_keys.py
+++ /dev/null
@@ -1,31 +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 TestSSHKeys(base.CloudTestCase):
-    """Example cloud-config test."""
-
-    def test_cert_count(self):
-        """Test cert count."""
-        out = self.get_data_file('cert_count')
-        self.assertEqual(20, int(out))
-
-    def test_dsa_public(self):
-        """Test DSA key has ending."""
-        out = self.get_data_file('dsa_public')
-        self.assertIn('ZN4XnifuO5krqAybngIy66PMEoQ= smoser@localhost', out)
-
-    def test_rsa_public(self):
-        """Test RSA key has specific ending."""
-        out = self.get_data_file('rsa_public')
-        self.assertIn('PemAWthxHO18QJvWPocKJtlsDNi3 smoser@localhost', out)
-
-    def test_auth_keys(self):
-        """Test authorized keys has specific ending."""
-        out = self.get_data_file('auth_keys')
-        self.assertIn('QPOt5Q8zWd9qG7PBl9+eiH5qV7NZ mykey@host', out)
-        self.assertIn('Hj29SCmXp5Kt5/82cD/VN3NtHw== smoser@brickies', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/examples/configure_instances_ssh_keys.yaml b/tests/cloud_tests/testcases/examples/configure_instances_ssh_keys.yaml
deleted file mode 100644
index f3eaf3ce..00000000
--- a/tests/cloud_tests/testcases/examples/configure_instances_ssh_keys.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# From cloud config examples on cloudinit.readthedocs.io
-#
-# 2016-11-17: Disabled as covered by module based tests
-#
-enabled: False
-cloud_config: |
-  #cloud-config
-  ssh_authorized_keys:
-    - ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAGEA3FSyQwBI6Z+nCSjUUk8EEAnnkhXlukKoUPND/RRClWz2s5TCzIkd3Ou5+Cyz71X0XmazM3l5WgeErvtIwQMyT1KjNoMhoJMrJnWqQPOt5Q8zWd9qG7PBl9+eiH5qV7NZ mykey@host
-    - ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA3I7VUf2l5gSn5uavROsc5HRDpZdQueUq5ozemNSj8T7enqKHOEaFoU2VoPgGEWC9RyzSQVeyD6s7APMcE82EtmW4skVEgEGSbDc1pvxzxtchBj78hJP6Cf5TCMFSXw+Fz5rF1dR23QDbN1mkHs7adr8GW4kSWqU7Q7NDwfIrJJtO7Hi42GyXtvEONHbiRPOe8stqUly7MvUoN+5kfjBM8Qqpfl2+FNhTYWpMfYdPUnE7u536WqzFmsaqJctz3gBxH9Ex7dFtrxR4qiqEr9Qtlu3xGn7Bw07/+i1D+ey3ONkZLN+LQ714cgj8fRS4Hj29SCmXp5Kt5/82cD/VN3NtHw== smoser@brickies
-
-  # Send pre-generated ssh private keys to the server
-  # If these are present, they will be written to /etc/ssh and
-  # new random keys will not be generated
-  #  in addition to 'rsa' and 'dsa' as shown below, 'ecdsa' is also supported
-  ssh_keys:
-    rsa_private: |
-      -----BEGIN RSA PRIVATE KEY-----
-      MIIBxwIBAAJhAKD0YSHy73nUgysO13XsJmd4fHiFyQ+00R7VVu2iV9Qcon2LZS/x
-      1cydPZ4pQpfjEha6WxZ6o8ci/Ea/w0n+0HGPwaxlEG2Z9inNtj3pgFrYcRztfECb
-      1j6HCibZbAzYtwIBIwJgO8h72WjcmvcpZ8OvHSvTwAguO2TkR6mPgHsgSaKy6GJo
-      PUJnaZRWuba/HX0KGyhz19nPzLpzG5f0fYahlMJAyc13FV7K6kMBPXTRR6FxgHEg
-      L0MPC7cdqAwOVNcPY6A7AjEA1bNaIjOzFN2sfZX0j7OMhQuc4zP7r80zaGc5oy6W
-      p58hRAncFKEvnEq2CeL3vtuZAjEAwNBHpbNsBYTRPCHM7rZuG/iBtwp8Rxhc9I5w
-      ixvzMgi+HpGLWzUIBS+P/XhekIjPAjA285rVmEP+DR255Ls65QbgYhJmTzIXQ2T9
-      luLvcmFBC6l35Uc4gTgg4ALsmXLn71MCMGMpSWspEvuGInayTCL+vEjmNBT+FAdO
-      W7D4zCpI43jRS9U06JVOeSc9CDk2lwiA3wIwCTB/6uc8Cq85D9YqpM10FuHjKpnP
-      REPPOyrAspdeOAV+6VKRavstea7+2DZmSUgE
-      -----END RSA PRIVATE KEY-----
-
-    rsa_public: ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAGEAoPRhIfLvedSDKw7XdewmZ3h8eIXJD7TRHtVW7aJX1ByifYtlL/HVzJ09nilCl+MSFrpbFnqjxyL8Rr/DSf7QcY/BrGUQbZn2Kc22PemAWthxHO18QJvWPocKJtlsDNi3 smoser@localhost
-
-    dsa_private: |
-      -----BEGIN DSA PRIVATE KEY-----
-      MIIBuwIBAAKBgQDP2HLu7pTExL89USyM0264RCyWX/CMLmukxX0Jdbm29ax8FBJT
-      pLrO8TIXVY5rPAJm1dTHnpuyJhOvU9G7M8tPUABtzSJh4GVSHlwaCfycwcpLv9TX
-      DgWIpSj+6EiHCyaRlB1/CBp9RiaB+10QcFbm+lapuET+/Au6vSDp9IRtlQIVAIMR
-      8KucvUYbOEI+yv+5LW9u3z/BAoGBAI0q6JP+JvJmwZFaeCMMVxXUbqiSko/P1lsa
-      LNNBHZ5/8MOUIm8rB2FC6ziidfueJpqTMqeQmSAlEBCwnwreUnGfRrKoJpyPNENY
-      d15MG6N5J+z81sEcHFeprryZ+D3Ge9VjPq3Tf3NhKKwCDQ0240aPezbnjPeFm4mH
-      bYxxcZ9GAoGAXmLIFSQgiAPu459rCKxT46tHJtM0QfnNiEnQLbFluefZ/yiI4DI3
-      8UzTCOXLhUA7ybmZha+D/csj15Y9/BNFuO7unzVhikCQV9DTeXX46pG4s1o23JKC
-      /QaYWNMZ7kTRv+wWow9MhGiVdML4ZN4XnifuO5krqAybngIy66PMEoQCFEIsKKWv
-      99iziAH0KBMVbxy03Trz
-      -----END DSA PRIVATE KEY-----
-
-    dsa_public: ssh-dsa AAAAB3NzaC1kc3MAAACBAM/Ycu7ulMTEvz1RLIzTbrhELJZf8Iwua6TFfQl1ubb1rHwUElOkus7xMhdVjms8AmbV1Meem7ImE69T0bszy09QAG3NImHgZVIeXBoJ/JzByku/1NcOBYilKP7oSIcLJpGUHX8IGn1GJoH7XRBwVub6Vqm4RP78C7q9IOn0hG2VAAAAFQCDEfCrnL1GGzhCPsr/uS1vbt8/wQAAAIEAjSrok/4m8mbBkVp4IwxXFdRuqJKSj8/WWxos00Ednn/ww5QibysHYULrOKJ1+54mmpMyp5CZICUQELCfCt5ScZ9GsqgmnI80Q1h3Xkwbo3kn7PzWwRwcV6muvJn4PcZ71WM+rdN/c2EorAINDTbjRo97NueM94WbiYdtjHFxn0YAAACAXmLIFSQgiAPu459rCKxT46tHJtM0QfnNiEnQLbFluefZ/yiI4DI38UzTCOXLhUA7ybmZha+D/csj15Y9/BNFuO7unzVhikCQV9DTeXX46pG4s1o23JKC/QaYWNMZ7kTRv+wWow9MhGiVdML4ZN4XnifuO5krqAybngIy66PMEoQ= smoser@localhost
-collect_scripts:
-  cert_count: |
-    #!/bin/bash
-    ls | wc -l
-  dsa_public: |
-    #!/bin/bash
-    cat /etc/ssh/ssh_host_dsa_key.pub
-  rsa_public: |
-    #!/bin/bash
-    cat /etc/ssh/ssh_host_rsa_key.pub
-  auth_keys: |
-    #!/bin/bash
-    cat /home/ubuntu/.ssh/authorized_keys
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/examples/including_user_groups.py b/tests/cloud_tests/testcases/examples/including_user_groups.py
deleted file mode 100644
index 4067348d..00000000
--- a/tests/cloud_tests/testcases/examples/including_user_groups.py
+++ /dev/null
@@ -1,49 +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 TestUserGroups(base.CloudTestCase):
-    """Example cloud-config test."""
-
-    def test_group_ubuntu(self):
-        """Test ubuntu group exists."""
-        out = self.get_data_file('group_ubuntu')
-        self.assertRegex(out, r'ubuntu:x:[0-9]{4}:')
-
-    def test_group_cloud_users(self):
-        """Test cloud users group exists."""
-        out = self.get_data_file('group_cloud_users')
-        self.assertRegex(out, r'cloud-users:x:[0-9]{4}:barfoo')
-
-    def test_user_ubuntu(self):
-        """Test ubuntu user exists."""
-        out = self.get_data_file('user_ubuntu')
-        self.assertRegex(
-            out, r'ubuntu:x:[0-9]{4}:[0-9]{4}:Ubuntu:/home/ubuntu:/bin/bash')
-
-    def test_user_foobar(self):
-        """Test foobar user exists."""
-        out = self.get_data_file('user_foobar')
-        self.assertRegex(
-            out, r'foobar:x:[0-9]{4}:[0-9]{4}:Foo B. Bar:/home/foobar:')
-
-    def test_user_barfoo(self):
-        """Test barfoo user exists."""
-        out = self.get_data_file('user_barfoo')
-        self.assertRegex(
-            out, r'barfoo:x:[0-9]{4}:[0-9]{4}:Bar B. Foo:/home/barfoo:')
-
-    def test_user_cloudy(self):
-        """Test cloudy user exists."""
-        out = self.get_data_file('user_cloudy')
-        self.assertRegex(out, r'cloudy:x:[0-9]{3,4}:')
-
-    def test_user_root_in_secret(self):
-        """Test root user is in 'secret' group."""
-        _user, _, groups = self.get_data_file('root_groups').partition(":")
-        self.assertIn("secret", groups.split(),
-                      msg="User root is not in group 'secret'")
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/examples/including_user_groups.yaml b/tests/cloud_tests/testcases/examples/including_user_groups.yaml
deleted file mode 100644
index 86e392dd..00000000
--- a/tests/cloud_tests/testcases/examples/including_user_groups.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# From cloud config examples on cloudinit.readthedocs.io
-#
-# 2016-11-17: Disabled as covered by module based tests
-#
-enabled: False
-cloud_config: |
-  #cloud-config
-  # Add groups to the system
-  groups:
-    - secret: [root]
-    - cloud-users
-
-  # Add users to the system. Users are added after groups are added.
-  users:
-    - default
-    - name: foobar
-      gecos: Foo B. Bar
-      primary_group: foobar
-      groups: users
-      expiredate: '2038-01-19'
-      lock_passwd: false
-      passwd: $6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/
-    - name: barfoo
-      gecos: Bar B. Foo
-      sudo: ALL=(ALL) NOPASSWD:ALL
-      groups: [cloud-users, secret]
-      lock_passwd: true
-    - name: cloudy
-      gecos: Magic Cloud App Daemon User
-      inactive: '5'
-      system: true
-collect_scripts:
-  group_ubuntu: |
-    #!/bin/bash
-    getent group ubuntu
-  group_cloud_users: |
-    #!/bin/bash
-    getent group cloud-users
-  user_ubuntu: |
-    #!/bin/bash
-    getent passwd ubuntu
-  user_foobar: |
-    #!/bin/bash
-    getent passwd foobar
-  user_barfoo: |
-    #!/bin/bash
-    getent passwd barfoo
-  user_cloudy: |
-    #!/bin/bash
-    getent passwd cloudy
-  root_groups: |
-    #!/bin/bash
-    groups root
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/examples/install_arbitrary_packages.py b/tests/cloud_tests/testcases/examples/install_arbitrary_packages.py
deleted file mode 100644
index df133844..00000000
--- a/tests/cloud_tests/testcases/examples/install_arbitrary_packages.py
+++ /dev/null
@@ -1,20 +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 TestInstall(base.CloudTestCase):
-    """Example cloud-config test."""
-
-    def test_htop(self):
-        """Verify htop installed."""
-        out = self.get_data_file('htop')
-        self.assertEqual(1, int(out))
-
-    def test_tree(self):
-        """Verify tree installed."""
-        out = self.get_data_file('treeutils')
-        self.assertEqual(1, int(out))
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/examples/install_arbitrary_packages.yaml b/tests/cloud_tests/testcases/examples/install_arbitrary_packages.yaml
deleted file mode 100644
index d3980228..00000000
--- a/tests/cloud_tests/testcases/examples/install_arbitrary_packages.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# From cloud config examples on cloudinit.readthedocs.io
-#
-# 2016-11-17: Disabled as covered by module based tests
-#
-enabled: False
-cloud_config: |
-  #cloud-config
-  packages:
-   - htop
-   - tree
-collect_scripts:
-  htop: |
-    #!/bin/bash
-    dpkg -l | grep htop | wc -l
-  tree: |
-    #!/bin/bash
-    dpkg -l | grep tree | wc -l
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/examples/install_run_chef_recipes.py b/tests/cloud_tests/testcases/examples/install_run_chef_recipes.py
deleted file mode 100644
index 4ec26b8f..00000000
--- a/tests/cloud_tests/testcases/examples/install_run_chef_recipes.py
+++ /dev/null
@@ -1,17 +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 TestChefExample(base.CloudTestCase):
-    """Test chef module."""
-
-    def test_chef_basic(self):
-        """Test chef installed."""
-        out = self.get_data_file('chef_installed')
-        self.assertIn('install ok', out)
-
-    # FIXME: Add more tests, and/or replace with comprehensive module tests
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/examples/install_run_chef_recipes.yaml b/tests/cloud_tests/testcases/examples/install_run_chef_recipes.yaml
deleted file mode 100644
index 68ca95b5..00000000
--- a/tests/cloud_tests/testcases/examples/install_run_chef_recipes.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# From cloud config examples on cloudinit.readthedocs.io
-#
-# 2017-03-31: Disabled as depends on third party apt repository
-#
-enabled: False
-cloud_config: |
-  #cloud-config
-  # Key from https://packages.chef.io/chef.asc
-  apt:
-    sources:
-      source1:
-        source: "deb http://packages.chef.io/repos/apt/stable $RELEASE main"
-        key: |
-          -----BEGIN PGP PUBLIC KEY BLOCK-----
-          Version: GnuPG v1.4.12 (Darwin)
-          Comment: GPGTools - http://gpgtools.org
-
-          mQGiBEppC7QRBADfsOkZU6KZK+YmKw4wev5mjKJEkVGlus+NxW8wItX5sGa6kdUu
-          twAyj7Yr92rF+ICFEP3gGU6+lGo0Nve7KxkN/1W7/m3G4zuk+ccIKmjp8KS3qn99
-          dxy64vcji9jIllVa+XXOGIp0G8GEaj7mbkixL/bMeGfdMlv8Gf2XPpp9vwCgn/GC
-          JKacfnw7MpLKUHOYSlb//JsEAJqao3ViNfav83jJKEkD8cf59Y8xKia5OpZqTK5W
-          ShVnNWS3U5IVQk10ZDH97Qn/YrK387H4CyhLE9mxPXs/ul18ioiaars/q2MEKU2I
-          XKfV21eMLO9LYd6Ny/Kqj8o5WQK2J6+NAhSwvthZcIEphcFignIuobP+B5wNFQpe
-          DbKfA/0WvN2OwFeWRcmmd3Hz7nHTpcnSF+4QX6yHRF/5BgxkG6IqBIACQbzPn6Hm
-          sMtm/SVf11izmDqSsQptCrOZILfLX/mE+YOl+CwWSHhl+YsFts1WOuh1EhQD26aO
-          Z84HuHV5HFRWjDLw9LriltBVQcXbpfSrRP5bdr7Wh8vhqJTPjrQnT3BzY29kZSBQ
-          YWNrYWdlcyA8cGFja2FnZXNAb3BzY29kZS5jb20+iGAEExECACAFAkppC7QCGwMG
-          CwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRApQKupg++Caj8sAKCOXmdG36gWji/K
-          +o+XtBfvdMnFYQCfTCEWxRy2BnzLoBBFCjDSK6sJqCu0IENIRUYgUGFja2FnZXMg
-          PHBhY2thZ2VzQGNoZWYuaW8+iGIEExECACIFAlQwYFECGwMGCwkIBwMCBhUIAgkK
-          CwQWAgMBAh4BAheAAAoJEClAq6mD74JqX94An26z99XOHWpLN8ahzm7cp13t4Xid
-          AJ9wVcgoUBzvgg91lKfv/34cmemZn7kCDQRKaQu0EAgAg7ZLCVGVTmLqBM6njZEd
-          Zbv+mZbvwLBSomdiqddE6u3eH0X3GuwaQfQWHUVG2yedyDMiG+EMtCdEeeRebTCz
-          SNXQ8Xvi22hRPoEsBSwWLZI8/XNg0n0f1+GEr+mOKO0BxDB2DG7DA0nnEISxwFkK
-          OFJFebR3fRsrWjj0KjDxkhse2ddU/jVz1BY7Nf8toZmwpBmdozETMOTx3LJy1HZ/
-          Te9FJXJMUaB2lRyluv15MVWCKQJro4MQG/7QGcIfrIZNfAGJ32DDSjV7/YO+IpRY
-          IL4CUBQ65suY4gYUG4jhRH6u7H1p99sdwsg5OIpBe/v2Vbc/tbwAB+eJJAp89Zeu
-          twADBQf/ZcGoPhTGFuzbkcNRSIz+boaeWPoSxK2DyfScyCAuG41CY9+g0HIw9Sq8
-          DuxQvJ+vrEJjNvNE3EAEdKl/zkXMZDb1EXjGwDi845TxEMhhD1dDw2qpHqnJ2mtE
-          WpZ7juGwA3sGhi6FapO04tIGacCfNNHmlRGipyq5ZiKIRq9mLEndlECr8cwaKgkS
-          0wWu+xmMZe7N5/t/TK19HXNh4tVacv0F3fYK54GUjt2FjCQV75USnmNY4KPTYLXA
-          dzC364hEMlXpN21siIFgB04w+TXn5UF3B4FfAy5hevvr4DtV4MvMiGLu0oWjpaLC
-          MpmrR3Ny2wkmO0h+vgri9uIP06ODWIhJBBgRAgAJBQJKaQu0AhsMAAoJEClAq6mD
-          74Jq4hIAoJ5KrYS8kCwj26SAGzglwggpvt3CAJ0bekyky56vNqoegB+y4PQVDv4K
-          zA==
-          =IxPr
-          -----END PGP PUBLIC KEY BLOCK-----
-
-  chef:
-
-   # Valid values are 'gems' and 'packages' and 'omnibus'
-   install_type: "packages"
-
-   # Boolean: run 'install_type' code even if chef-client
-   #          appears already installed.
-   force_install: false
-
-   # Chef settings
-   server_url: "https://chef.yourorg.com:4000"
-
-   # Node Name
-   # Defaults to the instance-id if not present
-   node_name: "your-node-name"
-
-   # Environment
-   # Defaults to '_default' if not present
-   environment: "production"
-
-   # Default validation name is chef-validator
-   validation_name: "yourorg-validator"
-   # if validation_cert's value is "system" then it is expected
-   # that the file already exists on the system.
-   validation_cert: |
-       -----BEGIN RSA PRIVATE KEY-----
-       YOUR-ORGS-VALIDATION-KEY-HERE
-       -----END RSA PRIVATE KEY-----
-
-   # A run list for a first boot json
-   run_list:
-    - "recipe[apache2]"
-    - "role[db]"
-
-   # Specify a list of initial attributes used by the cookbooks
-   initial_attributes:
-      apache:
-        prefork:
-          maxclients: 100
-        keepalive: "off"
-
-   # if install_type is 'omnibus', change the url to download
-   omnibus_url: "https://www.opscode.com/chef/install.sh"
-
-
-  # Capture all subprocess output into a logfile
-  # Useful for troubleshooting cloud-init issues
-  output: {all: '| tee -a /var/log/cloud-init-output.log'}
-
-collect_scripts:
-  chef_installed: |
-    #!/bin/sh
-    dpkg-query -W -f '${Status}\n' chef
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/examples/run_apt_upgrade.py b/tests/cloud_tests/testcases/examples/run_apt_upgrade.py
deleted file mode 100644
index 744e49cb..00000000
--- a/tests/cloud_tests/testcases/examples/run_apt_upgrade.py
+++ /dev/null
@@ -1,19 +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 TestUpgrade(base.CloudTestCase):
-    """Example cloud-config test."""
-
-    def test_upgrade(self):
-        """Test upgrade exists in apt history."""
-        out = self.get_data_file('cloud-init.log')
-        self.assertIn(
-            '[CLOUDINIT] util.py[DEBUG]: apt-upgrade '
-            '[eatmydata apt-get --option=Dpkg::Options::=--force-confold '
-            '--option=Dpkg::options::=--force-unsafe-io --assume-yes --quiet '
-            'dist-upgrade] took', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/examples/run_apt_upgrade.yaml b/tests/cloud_tests/testcases/examples/run_apt_upgrade.yaml
deleted file mode 100644
index 2b7eae4c..00000000
--- a/tests/cloud_tests/testcases/examples/run_apt_upgrade.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# From cloud config examples on cloudinit.readthedocs.io
-#
-# 2016-11-17: Disabled as covered by module based tests
-#
-enabled: False
-cloud_config: |
-  #cloud-config
-  package_upgrade: true
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/examples/run_commands.py b/tests/cloud_tests/testcases/examples/run_commands.py
deleted file mode 100644
index 01d5d4fc..00000000
--- a/tests/cloud_tests/testcases/examples/run_commands.py
+++ /dev/null
@@ -1,15 +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 TestRunCmd(base.CloudTestCase):
-    """Example cloud-config test."""
-
-    def test_run_cmd(self):
-        """Test run command worked."""
-        out = self.get_data_file('run_cmd')
-        self.assertIn('cloud-init run cmd test', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/examples/run_commands.yaml b/tests/cloud_tests/testcases/examples/run_commands.yaml
deleted file mode 100644
index f80eb8ce..00000000
--- a/tests/cloud_tests/testcases/examples/run_commands.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# From cloud config examples on cloudinit.readthedocs.io
-#
-# 2016-11-17: Disabled as covered by module based tests
-#
-enabled: False
-cloud_config: |
-  #cloud-config
-  runcmd:
-   - echo cloud-init run cmd test > /var/tmp/run_cmd
-collect_scripts:
-  run_cmd: |
-    #!/bin/bash
-    cat /var/tmp/run_cmd
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/examples/run_commands_first_boot.py b/tests/cloud_tests/testcases/examples/run_commands_first_boot.py
deleted file mode 100644
index 3f3d8f84..00000000
--- a/tests/cloud_tests/testcases/examples/run_commands_first_boot.py
+++ /dev/null
@@ -1,15 +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 TestBootCmd(base.CloudTestCase):
-    """Example cloud-config test."""
-
-    def test_bootcmd_host(self):
-        """Test boot command worked."""
-        out = self.get_data_file('hosts')
-        self.assertIn('192.168.1.130 us.archive.ubuntu.com', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/examples/run_commands_first_boot.yaml b/tests/cloud_tests/testcases/examples/run_commands_first_boot.yaml
deleted file mode 100644
index 7bd803db..00000000
--- a/tests/cloud_tests/testcases/examples/run_commands_first_boot.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# From cloud config examples on cloudinit.readthedocs.io
-#
-# 2016-11-17: Disabled as covered by module based tests
-#
-enabled: False
-cloud_config: |
-  #cloud-config
-  bootcmd:
-   - echo 192.168.1.130 us.archive.ubuntu.com > /etc/hosts
-collect_scripts:
-  hosts: |
-    #!/bin/bash
-    cat /etc/hosts
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/examples/setup_run_puppet.yaml b/tests/cloud_tests/testcases/examples/setup_run_puppet.yaml
deleted file mode 100644
index e366c042..00000000
--- a/tests/cloud_tests/testcases/examples/setup_run_puppet.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# From cloud config examples on cloudinit.readthedocs.io
-#
-# 2016-11-17: Disabled as test suite fails this long running test currently
-#
-enabled: False
-cloud_config: |
-  #cloud-config
-  puppet:
-   # Every key present in the conf object will be added to puppet.conf:
-   # [name]
-   # subkey=value
-   #
-   # For example the configuration below will have the following section
-   # added to puppet.conf:
-   # [puppetd]
-   # server=puppetmaster.example.org
-   # certname=i-0123456.ip-X-Y-Z.cloud.internal
-   #
-   # The puppmaster ca certificate will be available in
-   # /var/lib/puppet/ssl/certs/ca.pem
-   conf:
-     agent:
-       server: "puppetmaster.example.org"
-       # certname supports substitutions at runtime:
-       #   %i: instanceid
-       #       Example: i-0123456
-       #   %f: fqdn of the machine
-       #       Example: ip-X-Y-Z.cloud.internal
-       #
-       # NB: the certname will automatically be lowercased as required by puppet
-       certname: "%i.%f"
-     # ca_cert is a special case. It won't be added to puppet.conf.
-     # It holds the puppetmaster certificate in pem format.
-     # It should be a multi-line string (using the | yaml notation for
-     # multi-line strings).
-     # The puppetmaster certificate is located in
-     # /var/lib/puppet/ssl/ca/ca_crt.pem on the puppetmaster host.
-     #
-     ca_cert: |
-       -----BEGIN CERTIFICATE-----
-       MIICCTCCAXKgAwIBAgIBATANBgkqhkiG9w0BAQUFADANMQswCQYDVQQDDAJjYTAe
-       Fw0xMDAyMTUxNzI5MjFaFw0xNTAyMTQxNzI5MjFaMA0xCzAJBgNVBAMMAmNhMIGf
-       MA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCu7Q40sm47/E1Pf+r8AYb/V/FWGPgc
-       b014OmNoX7dgCxTDvps/h8Vw555PdAFsW5+QhsGr31IJNI3kSYprFQcYf7A8tNWu
-       1MASW2CfaEiOEi9F1R3R4Qlz4ix+iNoHiUDTjazw/tZwEdxaQXQVLwgTGRwVa+aA
-       qbutJKi93MILLwIDAQABo3kwdzA4BglghkgBhvhCAQ0EKxYpUHVwcGV0IFJ1Ynkv
-       T3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwDwYDVR0TAQH/BAUwAwEB/zAd
-       BgNVHQ4EFgQUu4+jHB+GYE5Vxo+ol1OAhevspjAwCwYDVR0PBAQDAgEGMA0GCSqG
-       SIb3DQEBBQUAA4GBAH/rxlUIjwNb3n7TXJcDJ6MMHUlwjr03BDJXKb34Ulndkpaf
-       +GAlzPXWa7bO908M9I8RnPfvtKnteLbvgTK+h+zX1XCty+S2EQWk29i2AdoqOTxb
-       hppiGMp0tT5Havu4aceCXiy2crVcudj3NFciy8X66SoECemW9UYDCb9T5D0d
-       -----END CERTIFICATE-----
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/examples/writing_out_arbitrary_files.py b/tests/cloud_tests/testcases/examples/writing_out_arbitrary_files.py
deleted file mode 100644
index 7bd520f6..00000000
--- a/tests/cloud_tests/testcases/examples/writing_out_arbitrary_files.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 TestWriteFiles(base.CloudTestCase):
-    """Example cloud-config test."""
-
-    def test_b64(self):
-        """Test b64 encoded file reads as ascii."""
-        out = self.get_data_file('file_b64')
-        self.assertIn('ASCII text', out)
-
-    def test_binary(self):
-        """Test binary file reads as executable."""
-        out = self.get_data_file('file_binary')
-        self.assertIn('ELF 64-bit LSB executable, x86-64, version 1', out)
-
-    def test_gzip(self):
-        """Test gzip file shows up as a shell script."""
-        out = self.get_data_file('file_gzip')
-        self.assertIn('POSIX shell script, ASCII text executable', out)
-
-    def test_text(self):
-        """Test text shows up as ASCII text."""
-        out = self.get_data_file('file_text')
-        self.assertIn('ASCII text', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/examples/writing_out_arbitrary_files.yaml b/tests/cloud_tests/testcases/examples/writing_out_arbitrary_files.yaml
deleted file mode 100644
index 6f78f994..00000000
--- a/tests/cloud_tests/testcases/examples/writing_out_arbitrary_files.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# From cloud config examples on cloudinit.readthedocs.io
-#
-# 2016-11-17: Disabled as covered by module based tests
-#
-enabled: False
-cloud_config: |
-  #cloud-config
-  write_files:
-  -   encoding: b64
-      content: CiMgVGhpcyBmaWxlIGNvbnRyb2xzIHRoZSBzdGF0ZSBvZiBTRUxpbnV4
-      owner: root:root
-      path: /root/file_b64
-      permissions: '0644'
-  -   content: |
-          # My new /root/file_text
-
-          SMBDOPTIONS="-D"
-      path: /root/file_text
-  -   content: !!binary |
-          f0VMRgIBAQAAAAAAAAAAAAIAPgABAAAAwARAAAAAAABAAAAAAAAAAJAVAAAAAAAAAAAAAEAAOAAI
-          AEAAHgAdAAYAAAAFAAAAQAAAAAAAAABAAEAAAAAAAEAAQAAAAAAAwAEAAAAAAADAAQAAAAAAAAgA
-          AAAAAAAAAwAAAAQAAAAAAgAAAAAAAAACQAAAAAAAAAJAAAAAAAAcAAAAAAAAABwAAAAAAAAAAQAA
-      path: /root/file_binary
-      permissions: '0555'
-  -   encoding: gzip
-      content: !!binary |
-          H4sIAIDb/U8C/1NW1E/KzNMvzuBKTc7IV8hIzcnJVyjPL8pJ4QIA6N+MVxsAAAA=
-      path: /root/file_gzip
-      permissions: '0755'
-collect_scripts:
-  file_b64: |
-    #!/bin/bash
-    file /root/file_b64
-  file_text: |
-    #!/bin/bash
-    file /root/file_text
-  file_binary: |
-    #!/bin/bash
-    file /root/file_binary
-  file_gzip: |
-    #!/bin/bash
-    file /root/file_gzip
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/main/README.md b/tests/cloud_tests/testcases/main/README.md
deleted file mode 100644
index 60346063..00000000
--- a/tests/cloud_tests/testcases/main/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Main Functionality Test Configs
-
-## purpose
-Test main features and config options of cloud-init such as logging, output
-redirection, early init and integration with init system
-
-## structure
-Should have one or more test configs for all main cloud-init output and logging
-options, and basic functionality test cases
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/main/__init__.py b/tests/cloud_tests/testcases/main/__init__.py
deleted file mode 100644
index 0a592637..00000000
--- a/tests/cloud_tests/testcases/main/__init__.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# This file is part of cloud-init. See LICENSE file for license information.
-
-"""Test verifiers for cloud-init main features.
-
-See configs/main/README.md for more information
-"""
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/main/command_output_simple.py b/tests/cloud_tests/testcases/main/command_output_simple.py
deleted file mode 100644
index 80a2c8d7..00000000
--- a/tests/cloud_tests/testcases/main/command_output_simple.py
+++ /dev/null
@@ -1,21 +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 TestCommandOutputSimple(base.CloudTestCase):
-    """Test functionality of simple output redirection."""
-
-    expected_warnings = ('Stdout, stderr changing to',)
-
-    def test_output_file(self):
-        """Ensure that the output file is not empty and has all stages."""
-        data = self.get_data_file('cloud-init-test-output')
-        self.assertNotEqual(len(data), 0, "specified log empty")
-        self.assertEqual(self.get_config_entry('final_message'),
-                         data.splitlines()[-1].strip())
-        # TODO: need to test that all stages redirected here
-
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/main/command_output_simple.yaml b/tests/cloud_tests/testcases/main/command_output_simple.yaml
deleted file mode 100644
index 08ca8940..00000000
--- a/tests/cloud_tests/testcases/main/command_output_simple.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Test functionality of simple output redirection
-#
-cloud_config: |
-    #cloud-config
-    output: { all: "| tee -a /var/log/cloud-init-test-output" }
-    final_message: "should be last line in cloud-init-test-output file"
-collect_scripts:
-    cloud-init-test-output: |
-        #!/bin/bash
-        cat /var/log/cloud-init-test-output
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/README.md b/tests/cloud_tests/testcases/modules/README.md
deleted file mode 100644
index d66101f2..00000000
--- a/tests/cloud_tests/testcases/modules/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Module Test Configs
-
-## Purpose
-Test functionality of cloud config modules. See
-[here](https://cloudinit.readthedocs.io/en/latest/topics/modules.html) for
-a full list.
-
-## Structure
-Should have one or more test configs for each module in cloudinit/config/. The
-name of the test should indicate which module the config is verifying.
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/TODO.md b/tests/cloud_tests/testcases/modules/TODO.md
deleted file mode 100644
index 9513cb2d..00000000
--- a/tests/cloud_tests/testcases/modules/TODO.md
+++ /dev/null
@@ -1,95 +0,0 @@
-# TODO
-
-The following lists complete or partially misisng modules. If a module is
-listed with nothing below it indicates that no work is completed on that
-module. If there is a list below the module name that is the remainig
-identified work.
-
-## apt_configure
-
-  * apt_get_wrapper
-    * What does this do? How to use it?
-  * apt_get_command
-    * To specify a different 'apt-get' command, set 'apt_get_command'.
-    This must be a list, and the subcommand (update, upgrade) is appended to it.
-    * Modify default and verify the options got passed correctly.
-  * preserve sources
-    * TBD
-
-## chef
-2016-11-17: Tests took > 60 seconds and test framework times out currently.
-
-## disable EC2 metadata
-
-## disk setup
-
-## emit upstart
-
-## fan
-
-## growpart
-
-## grub dpkg
-
-## landscape
-2016-11-17: Module is not working
-
-## lxd
-2016-11-17: Need a zfs backed test written
-
-## mcollective
-
-## migrator
-
-## mounts
-
-## phone home
-
-## power state change
-
-## puppet
-2016-11-17: Tests took > 60 seconds and test framework times out currently.
-
-## resizefs
-
-## resolv conf
-2016-11-17: Issues with changing resolv.conf and lxc backend.
-
-## redhat subscription
-2016-11-17: Need RH support in test framework.
-
-## rightscale userdata
-2016-11-17: Specific to RightScale cloud enviornment.
-
-## rsyslog
-
-## scripts per boot
-Not applicable to write a test for this as it specifies when something should be run.
-
-## scripts per instance
-Not applicable to write a test for this as it specifies when something should be run.
-
-## scripts per once
-Not applicable to write a test for this as it specifies when something should be run.
-
-## scripts user
-Not applicable to write a test for this as it specifies when something should be run.
-
-## scripts vendor
-Not applicable to write a test for this as it specifies when something should be run.
-
-## snap
-2019-12-19: Need to investigate
-
-## spacewalk
-
-## ssh authkey fingerprints
-The authkey_hash key does not appear to work. In fact the default claims to be md5, however syslog only shows sha256
-
-## update etc hosts
-2016-11-17: Issues with changing /etc/hosts and lxc backend.
-
-## yum add repo
-2016-11-17: Need RH support in test framework.
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/__init__.py b/tests/cloud_tests/testcases/modules/__init__.py
deleted file mode 100644
index 6ab8114d..00000000
--- a/tests/cloud_tests/testcases/modules/__init__.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# This file is part of cloud-init. See LICENSE file for license information.
-
-"""Test verifiers for cloud-init cc modules.
-
-See configs/modules/README.md for more information
-"""
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/apt_configure_conf.py b/tests/cloud_tests/testcases/modules/apt_configure_conf.py
deleted file mode 100644
index 3bf93447..00000000
--- a/tests/cloud_tests/testcases/modules/apt_configure_conf.py
+++ /dev/null
@@ -1,20 +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 TestAptconfigureConf(base.CloudTestCase):
-    """Test apt-configure module."""
-
-    def test_apt_conf_assumeyes(self):
-        """Test config assumes true."""
-        out = self.get_data_file('94cloud-init-config')
-        self.assertIn('Assume-Yes "true";', out)
-
-    def test_apt_conf_fixbroken(self):
-        """Test config fixes broken."""
-        out = self.get_data_file('94cloud-init-config')
-        self.assertIn('Fix-Broken "true";', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/apt_configure_conf.yaml b/tests/cloud_tests/testcases/modules/apt_configure_conf.yaml
deleted file mode 100644
index de453000..00000000
--- a/tests/cloud_tests/testcases/modules/apt_configure_conf.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Provide a configuration for APT
-#
-required_features:
-  - apt
-cloud_config: |
-  #cloud-config
-  apt:
-    conf: |
-      APT {
-          Get {
-              Assume-Yes "true";
-              Fix-Broken "true";
-          }
-      }
-collect_scripts:
-  94cloud-init-config: |
-    #!/bin/bash
-    cat /etc/apt/apt.conf.d/94cloud-init-config
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/apt_configure_disable_suites.py b/tests/cloud_tests/testcases/modules/apt_configure_disable_suites.py
deleted file mode 100644
index eabe4607..00000000
--- a/tests/cloud_tests/testcases/modules/apt_configure_disable_suites.py
+++ /dev/null
@@ -1,15 +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 TestAptconfigureDisableSuites(base.CloudTestCase):
-    """Test apt-configure module."""
-
-    def test_empty_sourcelist(self):
-        """Test source list is empty."""
-        out = self.get_data_file('sources.list')
-        self.assertEqual('', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/apt_configure_disable_suites.yaml b/tests/cloud_tests/testcases/modules/apt_configure_disable_suites.yaml
deleted file mode 100644
index 98800673..00000000
--- a/tests/cloud_tests/testcases/modules/apt_configure_disable_suites.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Disables everything in sources.list
-#
-required_features:
-  - apt
-  - lsb_release
-cloud_config: |
-  #cloud-config
-  apt:
-    disable_suites:
-      - $RELEASE
-      - $RELEASE-updates
-      - $RELEASE-backports
-      - $RELEASE-security
-collect_scripts:
-  sources.list: |
-    #!/bin/bash
-    grep -v '^#' /etc/apt/sources.list | sed '/^\s*$/d'
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/apt_configure_primary.py b/tests/cloud_tests/testcases/modules/apt_configure_primary.py
deleted file mode 100644
index 4950a2ef..00000000
--- a/tests/cloud_tests/testcases/modules/apt_configure_primary.py
+++ /dev/null
@@ -1,24 +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 TestAptconfigurePrimary(base.CloudTestCase):
-    """Test apt-configure module."""
-
-    def test_ubuntu_sources(self):
-        """Test no default Ubuntu entries exist."""
-        out = self.get_data_file('sources.list')
-        ubuntu_source_count = len(
-            [line for line in out.split('\n') if 'archive.ubuntu.com' in line])
-        self.assertEqual(0, ubuntu_source_count)
-
-    def test_gatech_sources(self):
-        """Test GaTech entries exist."""
-        out = self.get_data_file('sources.list')
-        gatech_source_count = len(
-            [line for line in out.split('\n') if 'gtlib.gatech.edu' in line])
-        self.assertGreater(gatech_source_count, 0)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/apt_configure_primary.yaml b/tests/cloud_tests/testcases/modules/apt_configure_primary.yaml
deleted file mode 100644
index cc067d4f..00000000
--- a/tests/cloud_tests/testcases/modules/apt_configure_primary.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Setup a custome primary sources.list
-#
-required_features:
-  - apt
-  - apt_src_cont
-cloud_config: |
-  #cloud-config
-  apt:
-    primary:
-      - arches:
-          - default
-        uri: "http://www.gtlib.gatech.edu/pub/ubuntu-releases/"
-collect_scripts:
-  sources.list: |
-      #!/bin/bash
-      cat /etc/apt/sources.list
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/apt_configure_proxy.py b/tests/cloud_tests/testcases/modules/apt_configure_proxy.py
deleted file mode 100644
index 0c61b6cc..00000000
--- a/tests/cloud_tests/testcases/modules/apt_configure_proxy.py
+++ /dev/null
@@ -1,22 +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 TestAptconfigureProxy(base.CloudTestCase):
-    """Test apt-configure module."""
-
-    def test_proxy_config(self):
-        """Test proxy options added to apt config."""
-        out = self.get_data_file('90cloud-init-aptproxy')
-        self.assertIn(
-            'Acquire::http::Proxy "http://squid.internal:3128";', out)
-        self.assertIn(
-            'Acquire::http::Proxy "http://squid.internal:3128";', out)
-        self.assertIn(
-            'Acquire::ftp::Proxy "ftp://squid.internal:3128";', out)
-        self.assertIn(
-            'Acquire::https::Proxy "https://squid.internal:3128";', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/apt_configure_proxy.yaml b/tests/cloud_tests/testcases/modules/apt_configure_proxy.yaml
deleted file mode 100644
index be6c6f81..00000000
--- a/tests/cloud_tests/testcases/modules/apt_configure_proxy.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Set apt proxy
-#
-required_features:
-  - apt
-cloud_config: |
-  #cloud-config
-  apt:
-    proxy: "http://squid.internal:3128"
-    http_proxy: "http://squid.internal:3128"
-    ftp_proxy: "ftp://squid.internal:3128"
-    https_proxy: "https://squid.internal:3128"
-collect_scripts:
-  90cloud-init-aptproxy: |
-    #!/bin/bash
-    cat /etc/apt/apt.conf.d/90cloud-init-aptproxy
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/apt_configure_security.py b/tests/cloud_tests/testcases/modules/apt_configure_security.py
deleted file mode 100644
index 7d7e2585..00000000
--- a/tests/cloud_tests/testcases/modules/apt_configure_security.py
+++ /dev/null
@@ -1,15 +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 TestAptconfigureSecurity(base.CloudTestCase):
-    """Test apt-configure module."""
-
-    def test_security_mirror(self):
-        """Test security lines added and uncommented in source.list."""
-        out = self.get_data_file('sources.list')
-        self.assertEqual(6, int(out))
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/apt_configure_security.yaml b/tests/cloud_tests/testcases/modules/apt_configure_security.yaml
deleted file mode 100644
index 83dd51df..00000000
--- a/tests/cloud_tests/testcases/modules/apt_configure_security.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Add security to sources.list
-#
-required_features:
-  - apt
-  - ubuntu_repos
-cloud_config: |
-  #cloud-config
-  apt:
-    security:
-      - arches:
-        - default
-collect_scripts:
-  sources.list: |
-    #!/bin/bash
-    grep -c security.ubuntu.com /etc/apt/sources.list
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/apt_configure_sources_key.py b/tests/cloud_tests/testcases/modules/apt_configure_sources_key.py
deleted file mode 100644
index d9061f3c..00000000
--- a/tests/cloud_tests/testcases/modules/apt_configure_sources_key.py
+++ /dev/null
@@ -1,23 +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 TestAptconfigureSourcesKey(base.CloudTestCase):
-    """Test apt-configure module."""
-
-    def test_apt_key_list(self):
-        """Test key list updated."""
-        out = self.get_data_file('apt_key_list')
-        self.assertIn(
-            '1FF0 D853 5EF7 E719 E5C8  1B9C 083D 06FB E4D3 04DF', out)
-        self.assertIn('Launchpad PPA for cloud init development team', out)
-
-    def test_source_list(self):
-        """Test source.list updated."""
-        out = self.get_data_file('sources.list')
-        self.assertIn(
-            'http://ppa.launchpad.net/cloud-init-dev/test-archive/ubuntu', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/apt_configure_sources_key.yaml b/tests/cloud_tests/testcases/modules/apt_configure_sources_key.yaml
deleted file mode 100644
index bde9398a..00000000
--- a/tests/cloud_tests/testcases/modules/apt_configure_sources_key.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Add a sources.list entry with a given key (Debian Jessie)
-#
-required_features:
-  - apt
-  - lsb_release
-cloud_config: |
-  #cloud-config
-  apt:
-    sources:
-      source1:
-        source: "deb http://ppa.launchpad.net/cloud-init-dev/test-archive/ubuntu $RELEASE main"
-        key: |
-          -----BEGIN PGP PUBLIC KEY BLOCK-----
-          Version: SKS 1.1.6
-          Comment: Hostname: keyserver.ubuntu.com
-
-          mQINBFbZRUIBEAC+A0PIKYBP9kLC4hQtRrffRS11uLo8/BdtmOdrlW0hpPHzCfKnjR3tvSEI
-          lqPHG1QrrjAXKZDnZMRz+h/px7lUztvytGzHPSJd5ARUzAyjyRezUhoJ3VSCxrPqx62avuWf
-          RfoJaIeHfDehL5/dTVkyiWxfVZ369ZX6JN2AgLsQTeybTQ75+2z0xPrrhnGmgh6g0qTYcAaq
-          M5ONOGiqeSBX/Smjh6ALy5XkhUiFGLsI7Yluf6XSICY/x7gd6RAfgSIQrUTNMoS1sqhT4aot
-          +xvOfQy8ySkfAK4NddXql6E/+ZqTmBY/Lr0YklFBy8jGT+UysfiIznPMIwbmgq5Li7BtDDtX
-          b8Uyi4edPpjtextezfXYn4NVIpPL5dPZS/FXh4HpzyH0pYCfrH4QDGA7i52AGmhpiOFjJMo6
-          N33sdjZHOH/2Vyp+QZaQnsdUAi1N4M6c33tQbpIScn1SY+El8z5JDA4PBzkw8HpLCi1gGoa6
-          V4kfbWqXXbGAJFkLkP/vc4+pY9axOlmCkJg7xCPwhI75y1cONgovhz+BEXOzolh5KZuGbGbj
-          xe0wva5DLBeIg7EQFf+99pOS7Syby3Xpm6ZbswEFV0cllK4jf/QMjtfInxobuMoI0GV0bE5l
-          WlRtPCK5FnbHwxi0wPNzB/5fwzJ77r6HgPrR0OkT0lWmbUyoOQARAQABtC1MYXVuY2hwYWQg
-          UFBBIGZvciBjbG91ZCBpbml0IGRldmVsb3BtZW50IHRlYW2JAjgEEwECACIFAlbZRUICGwMG
-          CwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEAg9Bvvk0wTfHfcP/REK5N2s1JYc69qEa9ZN
-          o6oi+A7l6AYw+ZY88O5TJe7F9otv5VXCIKSUT0Vsepjgf0mtXAgf/sb2lsJn/jp7tzgov3YH
-          vSrkTkRydz8xcA87gwQKePuvTLxQpftF4flrBxgSueIn5O/tPrBOxLz7EVYBc78SKg9aj9L2
-          yUp+YuNevlwfZCTYeBb9r3FHaab2HcgkwqYch66+nKYfwiLuQ9NzXXm0Wn0JcEQ6pWvJscbj
-          C9BdawWovfvMK5/YLfI6Btm7F4mIpQBdhSOUp/YXKmdvHpmwxMCN2QhqYK49SM7qE9aUDbJL
-          arppSEBtlCLWhRBZYLTUna+BkuQ1bHz4St++XTR49Qd7vDERALpApDjB2dxPfMiBzCMwQQyq
-          uy13exU8o2ETLg+dZSLfDTzrBNsBFmXlw8WW17nTISYdKeGKL+QdlUjpzdwUMMzHhAO8SmMH
-          zjeSlDSRMXBJFAFSbCl7EwmMKa3yVX0zInT91fNllZ3iatAmtVdqVH/BFQfTIMH2ET7A8WzJ
-          ZzVSuMRhqoKdr5AMcHuJGPUoVkVJHQA+NNvEiXSysF3faL7jmKapmUwrhpYYX2H8pf+VMu2e
-          cLflKTI28dl+ZQ4Pl/aVsxrti/pzhdYy05Sn5ddtySyIkvo8L1cU5MWpbvSlFPkTstBUDLBf
-          pb0uBy+g0oxJQg15
-          =uy53
-          -----END PGP PUBLIC KEY BLOCK-----
-collect_scripts:
-  sources.list: |
-    #!/bin/bash
-    cat /etc/apt/sources.list.d/source1.list
-  apt_key_list: |
-    #!/bin/bash
-    apt-key finger
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/apt_configure_sources_keyserver.py b/tests/cloud_tests/testcases/modules/apt_configure_sources_keyserver.py
deleted file mode 100644
index ddc86174..00000000
--- a/tests/cloud_tests/testcases/modules/apt_configure_sources_keyserver.py
+++ /dev/null
@@ -1,23 +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 TestAptconfigureSourcesKeyserver(base.CloudTestCase):
-    """Test apt-configure module."""
-
-    def test_apt_key_list(self):
-        """Test specific key added."""
-        out = self.get_data_file('apt_key_list')
-        self.assertIn(
-            '1FF0 D853 5EF7 E719 E5C8  1B9C 083D 06FB E4D3 04DF', out)
-        self.assertIn('Launchpad PPA for cloud init development team', out)
-
-    def test_source_list(self):
-        """Test source.list updated."""
-        out = self.get_data_file('sources.list')
-        self.assertIn(
-            'http://ppa.launchpad.net/cloud-init-dev/test-archive/ubuntu', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/apt_configure_sources_keyserver.yaml b/tests/cloud_tests/testcases/modules/apt_configure_sources_keyserver.yaml
deleted file mode 100644
index 25088135..00000000
--- a/tests/cloud_tests/testcases/modules/apt_configure_sources_keyserver.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Add a sources.list entry with a key from a keyserver
-#
-required_features:
-  - apt
-  - lsb_release
-cloud_config: |
-  #cloud-config
-  apt:
-    sources:
-      source1:
-        keyid: 1FF0D8535EF7E719E5C81B9C083D06FBE4D304DF
-        keyserver: keyserver.ubuntu.com
-        source: "deb http://ppa.launchpad.net/cloud-init-dev/test-archive/ubuntu $RELEASE main"
-collect_scripts:
-  sources.list: |
-    #!/bin/bash
-    cat /etc/apt/sources.list.d/source1.list
-  apt_key_list: |
-    #!/bin/bash
-    apt-key finger
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/apt_configure_sources_list.py b/tests/cloud_tests/testcases/modules/apt_configure_sources_list.py
deleted file mode 100644
index cf84e056..00000000
--- a/tests/cloud_tests/testcases/modules/apt_configure_sources_list.py
+++ /dev/null
@@ -1,31 +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 TestAptconfigureSourcesList(base.CloudTestCase):
-    """Test apt-configure module."""
-
-    def test_sources_list(self):
-        """Test sources.list includes sources."""
-        out = self.get_data_file('sources.list')
-
-        # Verify we have 6 entires
-        self.assertEqual(6, len(out.rstrip().split('\n')))
-
-        # Verify the keys generated the list correctly
-        self.assertRegex(out, r'deb http:\/\/archive.ubuntu.com\/ubuntu '
-                         '[a-z].* main restricted')
-        self.assertRegex(out, r'deb-src http:\/\/archive.ubuntu.com\/ubuntu '
-                         '[a-z].* main restricted')
-        self.assertRegex(out, r'deb http:\/\/archive.ubuntu.com\/ubuntu '
-                         '[a-z].* universe restricted')
-        self.assertRegex(out, r'deb-src http:\/\/archive.ubuntu.com\/ubuntu '
-                         '[a-z].* universe restricted')
-        self.assertRegex(out, r'deb http:\/\/security.ubuntu.com\/ubuntu '
-                         '[a-z].*security multiverse')
-        self.assertRegex(out, r'deb-src http:\/\/security.ubuntu.com\/ubuntu '
-                         '[a-z].*security multiverse')
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/apt_configure_sources_list.yaml b/tests/cloud_tests/testcases/modules/apt_configure_sources_list.yaml
deleted file mode 100644
index 87e470c1..00000000
--- a/tests/cloud_tests/testcases/modules/apt_configure_sources_list.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Generate a sources.list
-#
-required_features:
-  - apt
-  - lsb_release
-cloud_config: |
-  #cloud-config
-  apt:
-    primary:
-      - arches: [default]
-        uri: http://archive.ubuntu.com/ubuntu
-    security:
-      - arches: [default]
-        uri: http://security.ubuntu.com/ubuntu
-    sources_list: |
-      deb $MIRROR $RELEASE main restricted
-      deb-src $MIRROR $RELEASE main restricted
-      deb $PRIMARY $RELEASE universe restricted
-      deb-src $PRIMARY $RELEASE universe restricted
-      deb $SECURITY $RELEASE-security multiverse
-      deb-src $SECURITY $RELEASE-security multiverse
-collect_scripts:
-  sources.list: |
-    #/bin/bash
-    cat /etc/apt/sources.list
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/apt_configure_sources_ppa.py b/tests/cloud_tests/testcases/modules/apt_configure_sources_ppa.py
deleted file mode 100644
index dfbdeadf..00000000
--- a/tests/cloud_tests/testcases/modules/apt_configure_sources_ppa.py
+++ /dev/null
@@ -1,23 +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 TestAptconfigureSourcesPPA(base.CloudTestCase):
-    """Test apt-configure module."""
-
-    def test_ppa(self):
-        """Test specific ppa added."""
-        out = self.get_data_file('sources.list')
-        self.assertIn(
-            'http://ppa.launchpad.net/cloud-init-dev/test-archive/ubuntu', out)
-
-    def test_ppa_key(self):
-        """Test ppa key added."""
-        out = self.get_data_file('apt-key')
-        self.assertIn(
-            '1FF0 D853 5EF7 E719 E5C8  1B9C 083D 06FB E4D3 04DF', out)
-        self.assertIn('Launchpad PPA for cloud init development team', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/apt_configure_sources_ppa.yaml b/tests/cloud_tests/testcases/modules/apt_configure_sources_ppa.yaml
deleted file mode 100644
index b997bcfb..00000000
--- a/tests/cloud_tests/testcases/modules/apt_configure_sources_ppa.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Add a PPA to source.list
-#
-# NOTE: on older ubuntu releases the sources file added is named
-#       'cloud-init-dev-test-archive-trusty', without 'ubuntu' in the middle
-required_features:
-  - apt
-  - ppa
-  - ppa_file_name
-cloud_config: |
-  #cloud-config
-  apt:
-    sources:
-      source1:
-        keyid: 0165013E
-        keyserver: keyserver.ubuntu.com
-        source: "ppa:cloud-init-dev/test-archive"
-collect_scripts:
-  sources.list: |
-    #!/bin/bash
-    cat /etc/apt/sources.list.d/cloud-init-dev-ubuntu-test-archive-*.list
-  apt-key: |
-    #!/bin/bash
-    apt-key finger
-  sources_full: |
-    #!/bin/bash
-    cat /etc/apt/sources.list
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/apt_pipelining_disable.py b/tests/cloud_tests/testcases/modules/apt_pipelining_disable.py
deleted file mode 100644
index c98eedef..00000000
--- a/tests/cloud_tests/testcases/modules/apt_pipelining_disable.py
+++ /dev/null
@@ -1,15 +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 TestAptPipeliningDisable(base.CloudTestCase):
-    """Test apt-pipelining module."""
-
-    def test_disable_pipelining(self):
-        """Test pipelining disabled."""
-        out = self.get_data_file('90cloud-init-pipelining')
-        self.assertIn('Acquire::http::Pipeline-Depth "0";', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/apt_pipelining_disable.yaml b/tests/cloud_tests/testcases/modules/apt_pipelining_disable.yaml
deleted file mode 100644
index 22a31dc4..00000000
--- a/tests/cloud_tests/testcases/modules/apt_pipelining_disable.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Disable apt pipelining value
-#
-required_features:
-  - apt
-cloud_config: |
-  #cloud-config
-  apt_pipelining: false
-collect_scripts:
-  90cloud-init-pipelining: |
-    #!/bin/bash
-    cat /etc/apt/apt.conf.d/90cloud-init-pipelining
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/apt_pipelining_os.py b/tests/cloud_tests/testcases/modules/apt_pipelining_os.py
deleted file mode 100644
index 2b940a66..00000000
--- a/tests/cloud_tests/testcases/modules/apt_pipelining_os.py
+++ /dev/null
@@ -1,15 +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 TestAptPipeliningOS(base.CloudTestCase):
-    """Test apt-pipelining module."""
-
-    def test_os_pipelining(self):
-        """test 'os' settings does not write apt config file."""
-        out = self.get_data_file('90cloud-init-pipelining_not_written')
-        self.assertEqual(0, int(out))
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/apt_pipelining_os.yaml b/tests/cloud_tests/testcases/modules/apt_pipelining_os.yaml
deleted file mode 100644
index 86d5220b..00000000
--- a/tests/cloud_tests/testcases/modules/apt_pipelining_os.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Set apt pipelining value to OS, no conf written
-#
-required_features:
-  - apt
-cloud_config: |
-  #cloud-config
-  apt_pipelining: os
-collect_scripts:
-  90cloud-init-pipelining_not_written: |
-    #!/bin/bash
-    ls /etc/apt/apt.conf.d/90cloud-init-pipelining | wc -l
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/bootcmd.py b/tests/cloud_tests/testcases/modules/bootcmd.py
deleted file mode 100644
index f5b86b03..00000000
--- a/tests/cloud_tests/testcases/modules/bootcmd.py
+++ /dev/null
@@ -1,15 +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 TestBootCmd(base.CloudTestCase):
-    """Test bootcmd module."""
-
-    def test_bootcmd_host(self):
-        """Test boot cmd worked."""
-        out = self.get_data_file('hosts')
-        self.assertIn('192.168.1.130 us.archive.ubuntu.com', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/bootcmd.yaml b/tests/cloud_tests/testcases/modules/bootcmd.yaml
deleted file mode 100644
index 3a73994e..00000000
--- a/tests/cloud_tests/testcases/modules/bootcmd.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Early boot command
-#
-cloud_config: |
-  #cloud-config
-  bootcmd:
-   - echo 192.168.1.130 us.archive.ubuntu.com > /etc/hosts
-collect_scripts:
-  hosts: |
-    #!/bin/bash
-    cat /etc/hosts
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/byobu.py b/tests/cloud_tests/testcases/modules/byobu.py
deleted file mode 100644
index 74d0529a..00000000
--- a/tests/cloud_tests/testcases/modules/byobu.py
+++ /dev/null
@@ -1,24 +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 TestByobu(base.CloudTestCase):
-    """Test Byobu module."""
-
-    def test_byobu_installed(self):
-        """Test byobu installed."""
-        self.assertPackageInstalled('byobu')
-
-    def test_byobu_profile_enabled(self):
-        """Test byobu profile.d file exists."""
-        out = self.get_data_file('byobu_profile_enabled')
-        self.assertIn('/etc/profile.d/Z97-byobu.sh', out)
-
-    def test_byobu_launch_exists(self):
-        """Test byobu-launch exists."""
-        out = self.get_data_file('byobu_launch_exists')
-        self.assertIn('/usr/bin/byobu-launch', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/byobu.yaml b/tests/cloud_tests/testcases/modules/byobu.yaml
deleted file mode 100644
index d002a611..00000000
--- a/tests/cloud_tests/testcases/modules/byobu.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Install and enable byobu system wide and default user
-#
-required_features:
-  - byobu
-cloud_config: |
-  #cloud-config
-  byobu_by_default: enable
-collect_scripts:
-  byobu_profile_enabled: |
-    #!/bin/bash
-    ls /etc/profile.d/Z97-byobu.sh
-  byobu_launch_exists: |
-    #!/bin/bash
-    which /usr/bin/byobu-launch
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/ca_certs.py b/tests/cloud_tests/testcases/modules/ca_certs.py
deleted file mode 100644
index 6b56f639..00000000
--- a/tests/cloud_tests/testcases/modules/ca_certs.py
+++ /dev/null
@@ -1,33 +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 TestCaCerts(base.CloudTestCase):
-    """Test ca certs module."""
-
-    def test_certs_updated(self):
-        """Test certs have been updated in /etc/ssl/certs."""
-        out = self.get_data_file('cert_links')
-        # Bionic update-ca-certificates creates less links debian #895075
-        unlinked_files = []
-        links = {}
-        for cert_line in out.splitlines():
-            if '->' in cert_line:
-                fname, _sep, link = cert_line.split()
-                links[fname] = link
-            else:
-                unlinked_files.append(cert_line)
-        self.assertEqual(['ca-certificates.crt'], unlinked_files)
-        self.assertEqual('cloud-init-ca-certs.pem', links['a535c1f3.0'])
-        self.assertEqual(
-            '/usr/share/ca-certificates/cloud-init-ca-certs.crt',
-            links['cloud-init-ca-certs.pem'])
-
-    def test_cert_installed(self):
-        """Test line from our cert exists."""
-        out = self.get_data_file('cert')
-        self.assertIn('a36c744454555024e7f82edc420fd2c8', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/ca_certs.yaml b/tests/cloud_tests/testcases/modules/ca_certs.yaml
deleted file mode 100644
index 2cd91551..00000000
--- a/tests/cloud_tests/testcases/modules/ca_certs.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Remove existing ca_certs and install custom ca-cert
-#
-cloud_config: |
-  #cloud-config
-  ca-certs:
-    remove-defaults: true
-    trusted:
-      - |
-        -----BEGIN CERTIFICATE-----
-        MIIGJzCCBA+gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBsjELMAkGA1UEBhMCRlIx
-        DzANBgNVBAgMBkFsc2FjZTETMBEGA1UEBwwKU3RyYXNib3VyZzEYMBYGA1UECgwP
-        d3d3LmZyZWVsYW4ub3JnMRAwDgYDVQQLDAdmcmVlbGFuMS0wKwYDVQQDDCRGcmVl
-        bGFuIFNhbXBsZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxIjAgBgkqhkiG9w0BCQEW
-        E2NvbnRhY3RAZnJlZWxhbi5vcmcwHhcNMTIwNDI3MTAzMTE4WhcNMjIwNDI1MTAz
-        MTE4WjB+MQswCQYDVQQGEwJGUjEPMA0GA1UECAwGQWxzYWNlMRgwFgYDVQQKDA93
-        d3cuZnJlZWxhbi5vcmcxEDAOBgNVBAsMB2ZyZWVsYW4xDjAMBgNVBAMMBWFsaWNl
-        MSIwIAYJKoZIhvcNAQkBFhNjb250YWN0QGZyZWVsYW4ub3JnMIICIjANBgkqhkiG
-        9w0BAQEFAAOCAg8AMIICCgKCAgEA3W29+ID6194bH6ejLrIC4hb2Ugo8v6ZC+Mrc
-        k2dNYMNPjcOKABvxxEtBamnSaeU/IY7FC/giN622LEtV/3oDcrua0+yWuVafyxmZ
-        yTKUb4/GUgafRQPf/eiX9urWurtIK7XgNGFNUjYPq4dSJQPPhwCHE/LKAykWnZBX
-        RrX0Dq4XyApNku0IpjIjEXH+8ixE12wH8wt7DEvdO7T3N3CfUbaITl1qBX+Nm2Z6
-        q4Ag/u5rl8NJfXg71ZmXA3XOj7zFvpyapRIZcPmkvZYn7SMCp8dXyXHPdpSiIWL2
-        uB3KiO4JrUYvt2GzLBUThp+lNSZaZ/Q3yOaAAUkOx+1h08285Pi+P8lO+H2Xic4S
-        vMq1xtLg2bNoPC5KnbRfuFPuUD2/3dSiiragJ6uYDLOyWJDivKGt/72OVTEPAL9o
-        6T2pGZrwbQuiFGrGTMZOvWMSpQtNl+tCCXlT4mWqJDRwuMGrI4DnnGzt3IKqNwS4
-        Qyo9KqjMIPwnXZAmWPm3FOKe4sFwc5fpawKO01JZewDsYTDxVj+cwXwFxbE2yBiF
-        z2FAHwfopwaH35p3C6lkcgP2k/zgAlnBluzACUI+MKJ/G0gv/uAhj1OHJQ3L6kn1
-        SpvQ41/ueBjlunExqQSYD7GtZ1Kg8uOcq2r+WISE3Qc9MpQFFkUVllmgWGwYDuN3
-        Zsez95kCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNT
-        TCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFFlfyRO6G8y5qEFKikl5
-        ajb2fT7XMB8GA1UdIwQYMBaAFCNsLT0+KV14uGw+quK7Lh5sh/JTMA0GCSqGSIb3
-        DQEBBQUAA4ICAQAT5wJFPqervbja5+90iKxi1d0QVtVGB+z6aoAMuWK+qgi0vgvr
-        mu9ot2lvTSCSnRhjeiP0SIdqFMORmBtOCFk/kYDp9M/91b+vS+S9eAlxrNCB5VOf
-        PqxEPp/wv1rBcE4GBO/c6HcFon3F+oBYCsUQbZDKSSZxhDm3mj7pb67FNbZbJIzJ
-        70HDsRe2O04oiTx+h6g6pW3cOQMgIAvFgKN5Ex727K4230B0NIdGkzuj4KSML0NM
-        slSAcXZ41OoSKNjy44BVEZv0ZdxTDrRM4EwJtNyggFzmtTuV02nkUj1bYYYC5f0L
-        ADr6s0XMyaNk8twlWYlYDZ5uKDpVRVBfiGcq0uJIzIvemhuTrofh8pBQQNkPRDFT
-        Rq1iTo1Ihhl3/Fl1kXk1WR3jTjNb4jHX7lIoXwpwp767HAPKGhjQ9cFbnHMEtkro
-        RlJYdtRq5mccDtwT0GFyoJLLBZdHHMHJz0F9H7FNk2tTQQMhK5MVYwg+LIaee586
-        CQVqfbscp7evlgjLW98H+5zylRHAgoH2G79aHljNKMp9BOuq6SnEglEsiWGVtu2l
-        hnx8SB3sVJZHeer8f/UQQwqbAO+Kdy70NmbSaqaVtp8jOxLiidWkwSyRTsuU6D8i
-        DiH5uEqBXExjrj0FslxcVKdVj5glVcSmkLwZKbEU1OKwleT/iXFhvooWhQ==
-        -----END CERTIFICATE-----
-collect_scripts:
-  cert_links: |
-    #!/bin/bash
-    # links printed <filename> -> <link target>
-    # non-links printed <filename>
-    for file in `ls /etc/ssl/certs`; do
-        [ -h /etc/ssl/certs/$file ] && echo -n $file ' -> ' && readlink /etc/ssl/certs/$file || echo $file;
-    done
-  cert: |
-    #!/bin/bash
-    md5sum /etc/ssl/certs/ca-certificates.crt
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/debug_disable.py b/tests/cloud_tests/testcases/modules/debug_disable.py
deleted file mode 100644
index e40e4b89..00000000
--- a/tests/cloud_tests/testcases/modules/debug_disable.py
+++ /dev/null
@@ -1,16 +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 TestDebugDisable(base.CloudTestCase):
-    """Disable debug messages."""
-
-    def test_debug_disable(self):
-        """Test verbose output missing from logs."""
-        out = self.get_data_file('cloud-init.log')
-        self.assertNotIn(
-            out, r'Skipping module named [a-z].* verbose printing disabled')
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/debug_disable.yaml b/tests/cloud_tests/testcases/modules/debug_disable.yaml
deleted file mode 100644
index 63218b18..00000000
--- a/tests/cloud_tests/testcases/modules/debug_disable.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Do not run in debug mode
-#
-cloud_config: |
-  #cloud-config
-  debug:
-    verbose: False
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/debug_enable.py b/tests/cloud_tests/testcases/modules/debug_enable.py
deleted file mode 100644
index 28d26062..00000000
--- a/tests/cloud_tests/testcases/modules/debug_enable.py
+++ /dev/null
@@ -1,15 +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 TestDebugEnable(base.CloudTestCase):
-    """Test debug messages."""
-
-    def test_debug_enable(self):
-        """Test debug messages in cloud-init log."""
-        out = self.get_data_file('cloud-init.log')
-        self.assertIn('[DEBUG]', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/debug_enable.yaml b/tests/cloud_tests/testcases/modules/debug_enable.yaml
deleted file mode 100644
index d44147db..00000000
--- a/tests/cloud_tests/testcases/modules/debug_enable.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Run in debug mode
-#
-cloud_config: |
-  #cloud-config
-  debug:
-    verbose: True
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/final_message.py b/tests/cloud_tests/testcases/modules/final_message.py
deleted file mode 100644
index b7b5d5e0..00000000
--- a/tests/cloud_tests/testcases/modules/final_message.py
+++ /dev/null
@@ -1,40 +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 TestFinalMessage(base.CloudTestCase):
-    """Test cloud init module `cc_final_message`."""
-
-    subs_char = '$'
-
-    def get_final_message_config(self):
-        """Get config for final message."""
-        self.assertIn('final_message', self.cloud_config)
-        return self.cloud_config['final_message']
-
-    def get_final_message(self):
-        """Get final message from log."""
-        out = self.get_data_file('cloud-init-output.log')
-        lines = len(self.get_final_message_config().splitlines())
-        return '\n'.join(out.splitlines()[-1 * lines:])
-
-    def test_final_message_string(self):
-        """Ensure final handles regular strings."""
-        for actual, config in zip(
-                self.get_final_message().splitlines(),
-                self.get_final_message_config().splitlines()):
-            if self.subs_char not in config:
-                self.assertEqual(actual, config)
-
-    def test_final_message_subs(self):
-        """Test variable substitution in final message."""
-        # TODO: add verification of other substitutions
-        patterns = {'$datasource': self.get_datasource()}
-        for key, expected in patterns.items():
-            index = self.get_final_message_config().splitlines().index(key)
-            actual = self.get_final_message().splitlines()[index]
-            self.assertEqual(actual, expected)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/final_message.yaml b/tests/cloud_tests/testcases/modules/final_message.yaml
deleted file mode 100644
index c9ed6118..00000000
--- a/tests/cloud_tests/testcases/modules/final_message.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Print a final message with various predefined variables
-#
-cloud_config: |
-  #cloud-config
-  final_message: |
-    This is my final message!
-    $version
-    $timestamp
-    $datasource
-    $uptime
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/keys_to_console.py b/tests/cloud_tests/testcases/modules/keys_to_console.py
deleted file mode 100644
index 07f38112..00000000
--- a/tests/cloud_tests/testcases/modules/keys_to_console.py
+++ /dev/null
@@ -1,22 +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 TestKeysToConsole(base.CloudTestCase):
-    """Test proper keys are included and excluded to console."""
-
-    def test_excluded_keys(self):
-        """Test excluded keys missing."""
-        out = self.get_data_file('syslog')
-        self.assertNotIn('(DSA)', out)
-        self.assertNotIn('(ECDSA)', out)
-
-    def test_expected_keys(self):
-        """Test expected keys exist."""
-        out = self.get_data_file('syslog')
-        self.assertIn('(ED25519)', out)
-        self.assertIn('(RSA)', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/keys_to_console.yaml b/tests/cloud_tests/testcases/modules/keys_to_console.yaml
deleted file mode 100644
index 5d86e739..00000000
--- a/tests/cloud_tests/testcases/modules/keys_to_console.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Hide printing of ssh key and fingerprints for specific keys
-#
-required_features:
-  - syslog
-cloud_config: |
-  #cloud-config
-  ssh_fp_console_blacklist: [ssh-dss, ssh-dsa, ecdsa-sha2-nistp256]
-  ssh_key_console_blacklist: [ssh-dss, ssh-dsa, ecdsa-sha2-nistp256]
-collect_scripts:
-  syslog: |
-    #!/bin/bash
-    cat /var/log/syslog
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/landscape.yaml b/tests/cloud_tests/testcases/modules/landscape.yaml
deleted file mode 100644
index ed2c37c4..00000000
--- a/tests/cloud_tests/testcases/modules/landscape.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Setup landscape client settings
-#
-# 2016-11-17: Disabled due to this not working
-#
-enabled: false
-required_features:
-  - landscape
-cloud_config: |
-  #cloud-conifg
-  landscape:
-    client:
-      log_level: "info"
-      url: "https://landscape.canonical.com/message-system"
-      ping_url: "http://landscape.canonical.com/ping"
-      data_path: "/var/lib/landscape/client"
-      http_proxy: "http://my.proxy.com/foobar"
-      https_proxy: "https://my.proxy.com/foobar"
-      tags: "server,cloud"
-      computer_title: "footitle"
-      registration_key: "fookey"
-      account_name: "fooaccount"
-collect_scripts:
-  client.conf: |
-    #!/bin/bash
-    cat /etc/landscape/client.conf
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/locale.py b/tests/cloud_tests/testcases/modules/locale.py
deleted file mode 100644
index cb9e1dce..00000000
--- a/tests/cloud_tests/testcases/modules/locale.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
-
-from cloudinit import util
-
-
-class TestLocale(base.CloudTestCase):
-    """Test locale is set properly."""
-
-    def test_locale(self):
-        """Test locale is set properly."""
-        data = util.load_shell_content(self.get_data_file('locale_default'))
-        self.assertIn("LANG", data)
-        self.assertEqual('en_GB.UTF-8', data['LANG'])
-
-    def test_locale_a(self):
-        """Test locale -a has both options."""
-        out = self.get_data_file('locale_a')
-        self.assertIn('en_GB.utf8', out)
-        self.assertIn('en_US.utf8', out)
-
-    def test_locale_gen(self):
-        """Test local.gen file has all entries."""
-        out = self.get_data_file('locale_gen')
-        self.assertIn('en_GB.UTF-8', out)
-        self.assertIn('en_US.UTF-8', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/locale.yaml b/tests/cloud_tests/testcases/modules/locale.yaml
deleted file mode 100644
index e01518a1..00000000
--- a/tests/cloud_tests/testcases/modules/locale.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Set locale to non-default option and verify
-#
-required_features:
-  - engb_locale
-  - locale_gen
-cloud_config: |
-  #cloud-config
-  locale: en_GB.UTF-8
-  locale_configfile: /etc/default/locale
-collect_scripts:
-  locale_default: |
-    #!/bin/bash
-    cat /etc/default/locale
-  locale_a: |
-    #!/bin/bash
-    locale -a
-  locale_gen: |
-    #!/bin/bash
-    cat /etc/locale.gen | grep -v '^#' | uniq
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/lxd_bridge.py b/tests/cloud_tests/testcases/modules/lxd_bridge.py
deleted file mode 100644
index ea545e0a..00000000
--- a/tests/cloud_tests/testcases/modules/lxd_bridge.py
+++ /dev/null
@@ -1,36 +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 TestLxdBridge(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)
-
-    def test_bridge(self):
-        """Test bridge config."""
-        out = self.get_data_file('lxc-bridge')
-        self.assertIn('lxdbr0', out)
-        self.assertIn('10.100.100.1/24', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/lxd_bridge.yaml b/tests/cloud_tests/testcases/modules/lxd_bridge.yaml
deleted file mode 100644
index e6b7e76a..00000000
--- a/tests/cloud_tests/testcases/modules/lxd_bridge.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# LXD configured with directory backend and IPv4 bridge
-#
-required_features:
-  - lxd
-cloud_config: |
-  #cloud-config
-  lxd:
-    init:
-      storage_backend: dir
-    bridge:
-      mode: new
-      name: lxdbr0
-      ipv4_address: 10.100.100.1
-      ipv4_netmask: 24
-      ipv4_dhcp_first: 10.100.100.100
-      ipv4_dhcp_last: 10.100.100.200
-      ipv4_nat: true
-      domain: lxd
-collect_scripts:
-  lxc: |
-    #!/bin/bash
-    which lxc
-  lxd: |
-    #!/bin/bash
-    which lxd
-  lxc-bridge: |
-    #!/bin/bash
-    ip addr show lxdbr0
-    cat /etc/default/lxd-bridge 2>/dev/null | grep -v ^#  | sort -u
-
-# vi: ts=4 expandtab
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
diff --git a/tests/cloud_tests/testcases/modules/lxd_dir.yaml b/tests/cloud_tests/testcases/modules/lxd_dir.yaml
deleted file mode 100644
index f93a3fa7..00000000
--- a/tests/cloud_tests/testcases/modules/lxd_dir.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# LXD configured with directory backend
-#
-required_features:
-  - lxd
-cloud_config: |
-  #cloud-config
-  lxd:
-    init:
-      storage_backend: dir
-collect_scripts:
-  lxc: |
-    #!/bin/bash
-    which lxc
-  lxd: |
-    #!/bin/bash
-    which lxd
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/ntp.py b/tests/cloud_tests/testcases/modules/ntp.py
deleted file mode 100644
index c63cc15e..00000000
--- a/tests/cloud_tests/testcases/modules/ntp.py
+++ /dev/null
@@ -1,24 +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 TestNtp(base.CloudTestCase):
-    """Test ntp module"""
-
-    def test_ntp_installed(self):
-        """Test ntp installed"""
-        self.assertPackageInstalled('ntp')
-
-    def test_ntp_dist_entries(self):
-        """Test dist config file is empty"""
-        out = self.get_data_file('ntp_conf_dist_empty')
-        self.assertEqual(0, int(out))
-
-    def test_ntp_entries(self):
-        """Test config entries"""
-        out = self.get_data_file('ntp_conf_pool_list')
-        self.assertIn('pool.ntp.org iburst', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/ntp.yaml b/tests/cloud_tests/testcases/modules/ntp.yaml
deleted file mode 100644
index 7ea0707d..00000000
--- a/tests/cloud_tests/testcases/modules/ntp.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Emtpy NTP config to setup using defaults
-#
-cloud_config: |
-  #cloud-config
-  ntp:
-    ntp_client: ntp
-    pools: []
-    servers: []
-collect_scripts:
-  ntp_installed: |
-    #!/bin/bash
-    ntpd --version > /dev/null 2>&1
-    echo $?
-  ntp_conf_dist_empty: |
-    #!/bin/bash
-    ls /etc/ntp.conf.dist | wc -l
-  ntp_conf_pool_list: |
-    #!/bin/bash
-    grep 'pool.ntp.org' /etc/ntp.conf | grep -v ^#
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/ntp_chrony.py b/tests/cloud_tests/testcases/modules/ntp_chrony.py
deleted file mode 100644
index 7d341773..00000000
--- a/tests/cloud_tests/testcases/modules/ntp_chrony.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file is part of cloud-init. See LICENSE file for license information.
-
-"""cloud-init Integration Test Verify Script."""
-import unittest
-
-from tests.cloud_tests.testcases import base
-
-
-class TestNtpChrony(base.CloudTestCase):
-    """Test ntp module with chrony client"""
-
-    def setUp(self):
-        """Skip this suite of tests on lxd and artful or older."""
-        if self.platform == 'lxd':
-            if self.is_distro('ubuntu') and self.os_version_cmp('artful') <= 0:
-                raise unittest.SkipTest(
-                    'No support for chrony on containers <= artful.'
-                    ' LP: #1589780')
-        return super(TestNtpChrony, self).setUp()
-
-    def test_chrony_entries(self):
-        """Test chrony config entries"""
-        out = self.get_data_file('chrony_conf')
-        self.assertIn('.pool.ntp.org', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/ntp_chrony.yaml b/tests/cloud_tests/testcases/modules/ntp_chrony.yaml
deleted file mode 100644
index 120735e2..00000000
--- a/tests/cloud_tests/testcases/modules/ntp_chrony.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# ntp enabled, chrony selected, check conf file
-# as chrony won't start in a container
-#
-cloud_config: |
-  #cloud-config
-  ntp:
-    enabled: true
-    ntp_client: chrony
-collect_scripts:
-  chrony_conf: |
-    #!/bin/sh
-    set -- /etc/chrony.conf /etc/chrony/chrony.conf
-    for p in "$@"; do
-        [ -e "$p" ] && { cat "$p"; exit; }
-    done
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/ntp_pools.py b/tests/cloud_tests/testcases/modules/ntp_pools.py
deleted file mode 100644
index 152fd3f1..00000000
--- a/tests/cloud_tests/testcases/modules/ntp_pools.py
+++ /dev/null
@@ -1,34 +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 TestNtpPools(base.CloudTestCase):
-    """Test ntp module."""
-
-    def test_ntp_installed(self):
-        """Test ntp installed"""
-        out = self.get_data_file('ntp_installed_pools')
-        self.assertEqual(0, int(out))
-
-    def test_ntp_dist_entries(self):
-        """Test dist config file is empty"""
-        out = self.get_data_file('ntp_conf_dist_pools')
-        self.assertEqual(0, int(out))
-
-    def test_ntp_entires(self):
-        """Test config entries"""
-        out = self.get_data_file('ntp_conf_pools')
-        pools = self.cloud_config.get('ntp').get('pools')
-        for pool in pools:
-            self.assertIn('pool %s iburst' % pool, out)
-
-    def test_ntpq_servers(self):
-        """Test ntpq output has configured servers"""
-        out = self.get_data_file('ntpq_servers')
-        pools = self.cloud_config.get('ntp').get('pools')
-        for pool in pools:
-            self.assertIn(pool, out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/ntp_pools.yaml b/tests/cloud_tests/testcases/modules/ntp_pools.yaml
deleted file mode 100644
index 60fa0fd1..00000000
--- a/tests/cloud_tests/testcases/modules/ntp_pools.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# NTP config using specific pools
-#
-# NOTE: lsb_release listed here because with recent cloud-init deb with
-#       (LP: 1628337) resolved, cloud-init will attempt to configure archives.
-#       this fails without lsb_release as UNAVAILABLE is used for $RELEASE
-required_features:
-  - lsb_release
-cloud_config: |
-  #cloud-config
-  ntp:
-    ntp_client: ntp
-    pools:
-        - 0.cloud-init.mypool
-        - 1.cloud-init.mypool
-        - 172.16.15.14
-collect_scripts:
-  ntp_installed_pools: |
-    #!/bin/bash
-    ntpd --version > /dev/null 2>&1
-    echo $?
-  ntp_conf_dist_pools: |
-    #!/bin/bash
-    ls /etc/ntp.conf.dist | wc -l
-  ntp_conf_pools: |
-    #!/bin/bash
-    grep '^pool' /etc/ntp.conf
-  ntpq_servers: |
-    #!/bin/sh
-    ntpq -p -w -n
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/ntp_servers.py b/tests/cloud_tests/testcases/modules/ntp_servers.py
deleted file mode 100644
index 8d2a68b3..00000000
--- a/tests/cloud_tests/testcases/modules/ntp_servers.py
+++ /dev/null
@@ -1,34 +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 TestNtpServers(base.CloudTestCase):
-    """Test ntp module"""
-
-    def test_ntp_installed(self):
-        """Test ntp installed"""
-        out = self.get_data_file('ntp_installed_servers')
-        self.assertEqual(0, int(out))
-
-    def test_ntp_dist_entries(self):
-        """Test dist config file is empty"""
-        out = self.get_data_file('ntp_conf_dist_servers')
-        self.assertEqual(0, int(out))
-
-    def test_ntp_entries(self):
-        """Test config server entries"""
-        out = self.get_data_file('ntp_conf_servers')
-        servers = self.cloud_config.get('ntp').get('servers')
-        for server in servers:
-            self.assertIn('server %s iburst' % server, out)
-
-    def test_ntpq_servers(self):
-        """Test ntpq output has configured servers"""
-        out = self.get_data_file('ntpq_servers')
-        servers = self.cloud_config.get('ntp').get('servers')
-        for server in servers:
-            self.assertIn(server, out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/ntp_servers.yaml b/tests/cloud_tests/testcases/modules/ntp_servers.yaml
deleted file mode 100644
index ee636679..00000000
--- a/tests/cloud_tests/testcases/modules/ntp_servers.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# NTP config using specific servers
-#
-required_features:
-  - lsb_release
-cloud_config: |
-  #cloud-config
-  ntp:
-    ntp_client: ntp
-    servers:
-        - 172.16.15.14
-        - 172.16.17.18
-collect_scripts:
-  ntp_installed_servers: |
-    #!/bin/sh
-    ntpd --version > /dev/null 2>&1
-    echo $?
-  ntp_conf_dist_servers: |
-    #!/bin/sh
-    cat /etc/ntp.conf.dist | wc -l
-  ntp_conf_servers: |
-    #!/bin/sh
-    grep '^server' /etc/ntp.conf
-  ntpq_servers: |
-    #!/bin/sh
-    ntpq -p -w -n
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/ntp_timesyncd.py b/tests/cloud_tests/testcases/modules/ntp_timesyncd.py
deleted file mode 100644
index eca750bc..00000000
--- a/tests/cloud_tests/testcases/modules/ntp_timesyncd.py
+++ /dev/null
@@ -1,15 +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 TestNtpTimesyncd(base.CloudTestCase):
-    """Test ntp module with systemd-timesyncd client"""
-
-    def test_timesyncd_entries(self):
-        """Test timesyncd config entries"""
-        out = self.get_data_file('timesyncd_conf')
-        self.assertIn('.pool.ntp.org', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/ntp_timesyncd.yaml b/tests/cloud_tests/testcases/modules/ntp_timesyncd.yaml
deleted file mode 100644
index ee47a741..00000000
--- a/tests/cloud_tests/testcases/modules/ntp_timesyncd.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# ntp enabled, systemd-timesyncd selected, check conf file
-# as systemd-timesyncd won't start in a container
-#
-cloud_config: |
-  #cloud-config
-  ntp:
-    enabled: true
-    ntp_client: systemd-timesyncd
-collect_scripts:
-  timesyncd_conf: |
-    #!/bin/sh
-    cat /etc/systemd/timesyncd.conf.d/cloud-init.conf
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/package_update_upgrade_install.py b/tests/cloud_tests/testcases/modules/package_update_upgrade_install.py
deleted file mode 100644
index fecad768..00000000
--- a/tests/cloud_tests/testcases/modules/package_update_upgrade_install.py
+++ /dev/null
@@ -1,36 +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 TestPackageInstallUpdateUpgrade(base.CloudTestCase):
-    """Test package install update upgrade module."""
-
-    def test_installed_sl(self):
-        """Test sl got installed."""
-        self.assertPackageInstalled('sl')
-
-    def test_installed_tree(self):
-        """Test tree got installed."""
-        self.assertPackageInstalled('tree')
-
-    def test_apt_history(self):
-        """Test apt history for update command."""
-        out = self.get_data_file('apt_history_cmdline')
-        self.assertIn(
-            'Commandline: /usr/bin/apt-get --option=Dpkg::Options'
-            '::=--force-confold --option=Dpkg::options::=--force-unsafe-io '
-            '--assume-yes --quiet install sl tree', out)
-
-    def test_cloud_init_output(self):
-        """Test cloud-init-output for install & upgrade stuff."""
-        out = self.get_data_file('cloud-init-output.log')
-        self.assertIn('Setting up tree (', out)
-        self.assertIn('Setting up sl (', out)
-        self.assertIn('Reading package lists...', out)
-        self.assertIn('Building dependency tree...', out)
-        self.assertIn('Reading state information...', out)
-        self.assertIn('Calculating upgrade...', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/package_update_upgrade_install.yaml b/tests/cloud_tests/testcases/modules/package_update_upgrade_install.yaml
deleted file mode 100644
index dd79e438..00000000
--- a/tests/cloud_tests/testcases/modules/package_update_upgrade_install.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Update/upgrade via apt and then install a pair of packages
-#
-# NOTE: this should not require apt feature, use 'which' rather than 'dpkg -l'
-# NOTE: the testcase for this looks for the command in history.log as
-#       /usr/bin/apt-get..., which is not how it always appears. it should
-#       instead look for just apt-get...
-# NOTE: this testcase should not require 'apt_up_out', and should look for a
-#       call to 'apt-get upgrade' or 'apt-get dist-upgrade' in cloud-init.log
-#       rather than 'Calculating upgrade...' in output
-required_features:
-  - apt
-  - apt_hist_fmt
-  - apt_up_out
-cloud_config: |
-  #cloud-config
-  packages:
-    - sl
-    - tree
-  package_update: true
-  package_upgrade: true
-collect_scripts:
-  apt_history_cmdline: |
-    #!/bin/bash
-    grep ^Commandline: /var/log/apt/history.log
-  dpkg_show: |
-    #!/bin/bash
-    dpkg-query --show
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/runcmd.py b/tests/cloud_tests/testcases/modules/runcmd.py
deleted file mode 100644
index 9fce3062..00000000
--- a/tests/cloud_tests/testcases/modules/runcmd.py
+++ /dev/null
@@ -1,15 +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 TestRunCmd(base.CloudTestCase):
-    """Test runcmd module."""
-
-    def test_run_cmd(self):
-        """Test run command worked."""
-        out = self.get_data_file('run_cmd')
-        self.assertIn('cloud-init run cmd test', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/runcmd.yaml b/tests/cloud_tests/testcases/modules/runcmd.yaml
deleted file mode 100644
index 8309a883..00000000
--- a/tests/cloud_tests/testcases/modules/runcmd.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Run a simple command
-#
-cloud_config: |
-  #cloud-config
-  runcmd:
-   - echo cloud-init run cmd test > /var/tmp/run_cmd
-collect_scripts:
-  run_cmd: |
-    #!/bin/bash
-    cat /var/tmp/run_cmd
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/seed_random_command.yaml b/tests/cloud_tests/testcases/modules/seed_random_command.yaml
deleted file mode 100644
index 6a9157eb..00000000
--- a/tests/cloud_tests/testcases/modules/seed_random_command.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Use uuid to create a random string
-#
-# 2016-11-15 Disabled as this is not working currently
-#
-enabled: False
-cloud_config: |
-  #cloud-config
-  random_seed:
-    command: ["cat", "/proc/sys/kernel/random/uuid"]
-    command_required: true
-    file: /root/seed
-collect_scripts:
-  seed_data: |
-    #!/bin/bash
-    cat /root/seed
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/seed_random_data.py b/tests/cloud_tests/testcases/modules/seed_random_data.py
deleted file mode 100644
index db433d26..00000000
--- a/tests/cloud_tests/testcases/modules/seed_random_data.py
+++ /dev/null
@@ -1,15 +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 TestSeedRandom(base.CloudTestCase):
-    """Test seed random module."""
-
-    def test_random_seed_data(self):
-        """Test random data passed in exists."""
-        out = self.get_data_file('seed_data')
-        self.assertIn('MYUb34023nD:LFDK10913jk;dfnk:Df', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/seed_random_data.yaml b/tests/cloud_tests/testcases/modules/seed_random_data.yaml
deleted file mode 100644
index a9b2c885..00000000
--- a/tests/cloud_tests/testcases/modules/seed_random_data.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Push in random raw string to set as seed
-#
-cloud_config: |
-  #cloud-config
-  random_seed:
-    data: 'MYUb34023nD:LFDK10913jk;dfnk:Df'
-    encoding: raw
-    file: /root/seed
-collect_scripts:
-  seed_data: |
-    #!/bin/bash
-    cat /root/seed
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/set_hostname.py b/tests/cloud_tests/testcases/modules/set_hostname.py
deleted file mode 100644
index 1dbe64c2..00000000
--- a/tests/cloud_tests/testcases/modules/set_hostname.py
+++ /dev/null
@@ -1,17 +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 TestHostname(base.CloudTestCase):
-    """Test hostname module."""
-
-    ex_hostname = "cloudinit2"
-
-    def test_hostname(self):
-        """Test hostname command shows correct output."""
-        out = self.get_data_file('hostname')
-        self.assertIn(self.ex_hostname, out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/set_hostname.yaml b/tests/cloud_tests/testcases/modules/set_hostname.yaml
deleted file mode 100644
index 071fb220..00000000
--- a/tests/cloud_tests/testcases/modules/set_hostname.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Set the hostname and update /etc/hosts
-#
-required_features:
-  - hostname
-cloud_config: |
-  #cloud-config
-  hostname: cloudinit2
-
-collect_scripts:
-  hosts: |
-    #!/bin/bash
-    grep ^127 /etc/hosts
-  hostname: |
-    #!/bin/bash
-    hostname
-  fqdn: |
-    #!/bin/bash
-    hostname --fqdn
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/set_hostname_fqdn.py b/tests/cloud_tests/testcases/modules/set_hostname_fqdn.py
deleted file mode 100644
index a405b30b..00000000
--- a/tests/cloud_tests/testcases/modules/set_hostname_fqdn.py
+++ /dev/null
@@ -1,31 +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 import CI_DOMAIN
-from tests.cloud_tests.testcases import base
-
-
-class TestHostnameFqdn(base.CloudTestCase):
-    """Test Hostname module."""
-
-    ex_hostname = "cloudinit1"
-    ex_fqdn = "cloudinit2." + CI_DOMAIN
-
-    def test_hostname(self):
-        """Test hostname output."""
-        out = self.get_data_file('hostname')
-        self.assertIn(self.ex_hostname, out)
-
-    def test_hostname_fqdn(self):
-        """Test hostname fqdn output."""
-        out = self.get_data_file('fqdn')
-        self.assertIn(self.ex_fqdn, out)
-
-    def test_hosts(self):
-        """Test /etc/hosts file."""
-        out = self.get_data_file('hosts')
-        self.assertIn('127.0.1.1 %s %s' % (self.ex_fqdn, self.ex_hostname),
-                      out)
-        self.assertIn('127.0.0.1 localhost', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/set_hostname_fqdn.yaml b/tests/cloud_tests/testcases/modules/set_hostname_fqdn.yaml
deleted file mode 100644
index a85ee79e..00000000
--- a/tests/cloud_tests/testcases/modules/set_hostname_fqdn.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Set the hostname and update /etc/hosts
-#
-required_features:
-  - hostname
-cloud_config: |
-  #cloud-config
-  manage_etc_hosts: true
-  hostname: cloudinit1
-  # this needs changing if CI_DOMAIN were updated.
-  fqdn: cloudinit2.i9n.cloud-init.io
-collect_scripts:
-  hosts: |
-    #!/bin/bash
-    grep ^127 /etc/hosts
-  hostname: |
-    #!/bin/bash
-    hostname
-  fqdn: |
-    #!/bin/bash
-    hostname --fqdn
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/set_password.py b/tests/cloud_tests/testcases/modules/set_password.py
deleted file mode 100644
index a29b2261..00000000
--- a/tests/cloud_tests/testcases/modules/set_password.py
+++ /dev/null
@@ -1,22 +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 TestPassword(base.CloudTestCase):
-    """Test password module."""
-
-    # TODO add test to make sure password is actually "password"
-
-    def test_shadow(self):
-        """Test ubuntu user in shadow."""
-        out = self.get_data_file('shadow')
-        self.assertIn('ubuntu:', out)
-
-    def test_sshd_config(self):
-        """Test sshd config allows passwords."""
-        out = self.get_data_file('sshd_config')
-        self.assertIn('PasswordAuthentication yes', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/set_password.yaml b/tests/cloud_tests/testcases/modules/set_password.yaml
deleted file mode 100644
index 04d7c58a..00000000
--- a/tests/cloud_tests/testcases/modules/set_password.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Set password of default user
-#
-required_features:
-  - ubuntu_user
-cloud_config: |
-  #cloud-config
-  password: password
-  chpasswd: { expire: False }
-  ssh_pwauth: True
-collect_scripts:
-  shadow: |
-    #!/bin/bash
-    cat /etc/shadow
-  sshd_config: |
-    #!/bin/bash
-    grep '^PasswordAuth' /etc/ssh/sshd_config
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/set_password_expire.py b/tests/cloud_tests/testcases/modules/set_password_expire.py
deleted file mode 100644
index 967aca7b..00000000
--- a/tests/cloud_tests/testcases/modules/set_password_expire.py
+++ /dev/null
@@ -1,23 +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 TestPasswordExpire(base.CloudTestCase):
-    """Test password module."""
-
-    def test_shadow(self):
-        """Test user frozen in shadow."""
-        out = self.get_data_file('shadow')
-        self.assertIn('harry:!:', out)
-        self.assertIn('dick:!:', out)
-        self.assertIn('tom:!:', out)
-        self.assertIn('harry:!:', out)
-
-    def test_sshd_config(self):
-        """Test sshd config allows passwords."""
-        out = self.get_data_file('sshd_config')
-        self.assertIn('PasswordAuthentication yes', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/set_password_expire.yaml b/tests/cloud_tests/testcases/modules/set_password_expire.yaml
deleted file mode 100644
index ba6344b9..00000000
--- a/tests/cloud_tests/testcases/modules/set_password_expire.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Expire password for all users
-#
-required_features:
-  - sshd
-cloud_config: |
-  #cloud-config
-  chpasswd: { expire: True }
-  ssh_pwauth: yes
-  users:
-    - default
-    - name: tom
-      password: $1$xyz$sPMsLNmf66Ohl.ol6JvzE.
-      lock_passwd: false
-    - name: dick
-      password: $1$xyz$sPMsLNmf66Ohl.ol6JvzE.
-      lock_passwd: false
-    - name: harry
-      password: $1$xyz$sPMsLNmf66Ohl.ol6JvzE.
-      lock_passwd: false
-    - name: jane
-      password: $1$xyz$sPMsLNmf66Ohl.ol6JvzE.
-      lock_passwd: false
-collect_scripts:
-  shadow: |
-    #!/bin/bash
-    cat /etc/shadow
-  sshd_config: |
-    #!/bin/bash
-    grep '^PasswordAuth' /etc/ssh/sshd_config
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/set_password_list.py b/tests/cloud_tests/testcases/modules/set_password_list.py
deleted file mode 100644
index 375cd27d..00000000
--- a/tests/cloud_tests/testcases/modules/set_password_list.py
+++ /dev/null
@@ -1,12 +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 TestPasswordList(base.PasswordListTest, base.CloudTestCase):
-    """Test password setting via list in chpasswd/list."""
-
-    __test__ = True
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/set_password_list.yaml b/tests/cloud_tests/testcases/modules/set_password_list.yaml
deleted file mode 100644
index fd3e1e44..00000000
--- a/tests/cloud_tests/testcases/modules/set_password_list.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Set password of list of users
-#
-cloud_config: |
-  #cloud-config
-  ssh_pwauth: yes
-  users:
-    - default
-    - name: tom
-      # md5 gotomgo
-      passwd: "$1$S7$tT1BEDIYrczeryDQJfdPe0"
-      lock_passwd: false
-    - name: dick
-      # md5 gocubsgo
-      passwd: "$1$ssisyfpf$YqvuJLfrrW6Cg/l53Pi1n1"
-      lock_passwd: false
-    - name: harry
-      # sha512 goharrygo
-      passwd: "$6$LF$9Z2p6rWK6TNC1DC6393ec0As.18KRAvKDbfsGJEdWN3sRQRwpdfoh37EQ3yUh69tP4GSrGW5XKHxMLiKowJgm/"
-      lock_passwd: false
-    - name: jane
-      # sha256 gojanego
-      passwd: "$5$iW$XsxmWCdpwIW8Yhv.Jn/R3uk6A4UaicfW5Xp7C9p9pg."
-      lock_passwd: false
-    - name: "mikey"
-      lock_passwd: false
-  chpasswd:
-    list:
-      - tom:mypassword123!
-      - dick:RANDOM
-      - harry:RANDOM
-      - mikey:$5$xZ$B2YGGEx2AOf4PeW48KC6.QyT1W2B4rZ9Qbltudtha89
-collect_scripts:
-  shadow: |
-    #!/bin/bash
-    cat /etc/shadow
-  sshd_config: |
-    #!/bin/bash
-    grep '^PasswordAuth' /etc/ssh/sshd_config
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/set_password_list_string.py b/tests/cloud_tests/testcases/modules/set_password_list_string.py
deleted file mode 100644
index 8c2634c5..00000000
--- a/tests/cloud_tests/testcases/modules/set_password_list_string.py
+++ /dev/null
@@ -1,12 +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 TestPasswordListString(base.PasswordListTest, base.CloudTestCase):
-    """Test password setting via string in chpasswd/list."""
-
-    __test__ = True
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/set_password_list_string.yaml b/tests/cloud_tests/testcases/modules/set_password_list_string.yaml
deleted file mode 100644
index e9fe54b0..00000000
--- a/tests/cloud_tests/testcases/modules/set_password_list_string.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Set password of list of users as a string
-#
-cloud_config: |
-  #cloud-config
-  ssh_pwauth: yes
-  users:
-    - default
-    - name: tom
-      # md5 gotomgo
-      passwd: "$1$S7$tT1BEDIYrczeryDQJfdPe0"
-      lock_passwd: false
-    - name: dick
-      # md5 gocubsgo
-      passwd: "$1$ssisyfpf$YqvuJLfrrW6Cg/l53Pi1n1"
-      lock_passwd: false
-    - name: harry
-      # sha512 goharrygo
-      passwd: "$6$LF$9Z2p6rWK6TNC1DC6393ec0As.18KRAvKDbfsGJEdWN3sRQRwpdfoh37EQ3yUh69tP4GSrGW5XKHxMLiKowJgm/"
-      lock_passwd: false
-    - name: jane
-      # sha256 gojanego
-      passwd: "$5$iW$XsxmWCdpwIW8Yhv.Jn/R3uk6A4UaicfW5Xp7C9p9pg."
-      lock_passwd: false
-    - name: "mikey"
-      lock_passwd: false
-  chpasswd:
-    list: |
-      tom:mypassword123!
-      dick:RANDOM
-      harry:RANDOM
-      mikey:$5$xZ$B2YGGEx2AOf4PeW48KC6.QyT1W2B4rZ9Qbltudtha89
-collect_scripts:
-  shadow: |
-    #!/bin/bash
-    cat /etc/shadow
-  sshd_config: |
-    #!/bin/bash
-    grep '^PasswordAuth' /etc/ssh/sshd_config
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/snap.py b/tests/cloud_tests/testcases/modules/snap.py
deleted file mode 100644
index ff68abbe..00000000
--- a/tests/cloud_tests/testcases/modules/snap.py
+++ /dev/null
@@ -1,16 +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 TestSnap(base.CloudTestCase):
-    """Test snap module"""
-
-    def test_snappy_version(self):
-        """Expect hello-world and core snaps are installed."""
-        out = self.get_data_file('snaplist')
-        self.assertIn('core', out)
-        self.assertIn('hello-world', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/snap.yaml b/tests/cloud_tests/testcases/modules/snap.yaml
deleted file mode 100644
index 322199c3..00000000
--- a/tests/cloud_tests/testcases/modules/snap.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Install snappy
-#
-# Aug 23, 2018: Disabled due to requiring a proxy for testing
-#    tests do not handle the proxy well at this time.
-enabled: False
-required_features:
-  - snap
-cloud_config: |
-  #cloud-config
-  package_update: true
-  snap:
-    squashfuse_in_container: true
-    commands:
-      - snap install hello-world
-collect_scripts:
-  snaplist: |
-    #!/bin/bash
-    snap list
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/ssh_auth_key_fingerprints_disable.py b/tests/cloud_tests/testcases/modules/ssh_auth_key_fingerprints_disable.py
deleted file mode 100644
index 02935447..00000000
--- a/tests/cloud_tests/testcases/modules/ssh_auth_key_fingerprints_disable.py
+++ /dev/null
@@ -1,16 +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 TestSshKeyFingerprintsDisable(base.CloudTestCase):
-    """Test ssh key fingerprints module."""
-
-    def test_cloud_init_log(self):
-        """Verify disabled."""
-        out = self.get_data_file('cloud-init.log')
-        self.assertIn('Skipping module named ssh-authkey-fingerprints, '
-                      'logging of SSH fingerprints disabled', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/ssh_auth_key_fingerprints_disable.yaml b/tests/cloud_tests/testcases/modules/ssh_auth_key_fingerprints_disable.yaml
deleted file mode 100644
index d93893e2..00000000
--- a/tests/cloud_tests/testcases/modules/ssh_auth_key_fingerprints_disable.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Disable fingerprint printing
-#
-required_features:
-  - syslog
-cloud_config: |
-  #cloud-config
-  no_ssh_fingerprints: true
-collect_scripts:
-  syslog: |
-    #!/bin/bash
-    cat /var/log/syslog
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/ssh_auth_key_fingerprints_enable.py b/tests/cloud_tests/testcases/modules/ssh_auth_key_fingerprints_enable.py
deleted file mode 100644
index 3510e75a..00000000
--- a/tests/cloud_tests/testcases/modules/ssh_auth_key_fingerprints_enable.py
+++ /dev/null
@@ -1,18 +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 TestSshKeyFingerprintsEnable(base.CloudTestCase):
-    """Test ssh key fingerprints module."""
-
-    def test_syslog(self):
-        """Verify output of syslog."""
-        out = self.get_data_file('syslog')
-        self.assertRegex(out, r'256 SHA256:.*(ECDSA)')
-        self.assertRegex(out, r'256 SHA256:.*(ED25519)')
-        self.assertNotRegex(out, r'1024 SHA256:.*(DSA)')
-        self.assertNotRegex(out, r'2048 SHA256:.*(RSA)')
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/ssh_auth_key_fingerprints_enable.yaml b/tests/cloud_tests/testcases/modules/ssh_auth_key_fingerprints_enable.yaml
deleted file mode 100644
index 9f5dc34a..00000000
--- a/tests/cloud_tests/testcases/modules/ssh_auth_key_fingerprints_enable.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Print auth keys with different hash than md5
-#
-# NOTE: testcase checks for '256 SHA256:.*(ECDSA)' on output line on trusty
-#       this fails as line in output reads '256:.*(ECDSA)'
-required_features:
-  - syslog
-  - ssh_key_fmt
-cloud_config: |
-  #cloud-config
-  ssh_genkeytypes:
-  - ecdsa
-  - ed25519
-  ssh_authorized_keys:
-    - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDXW9Gg5H7ehjdSc6qDzwNtgCy94XYHhEYlXZMO2+FJrH3wfHGiMfCwOHxcOMt2QiXItULthdeQWS9QjBSSjVRXf6731igFrqPFyS9qBlOQ5D29C4HBXFnQggGVpBNJ82IRJv7szbbe/vpgLBP4kttUza9Dr4e1YM1ln4PRnjfXea6T0m+m1ixNb5432pTXlqYOnNOxSIm1gHgMLxPuDrJvQERDKrSiKSjIdyC9Jd8t2e1tkNLY0stmckVRbhShmcJvlyofHWbc2Ca1mmtP7MlS1VQnfLkvU1IrFwkmaQmaggX6WR6coRJ6XFXdWcq/AI2K6GjSnl1dnnCxE8VCEXBlXgFzad+PMSG4yiL5j8Oo1ZVpkTdgBnw4okGqTYCXyZg6X00As9IBNQfZMFlQXlIo4FiWgj3CO5QHQOyOX6FuEumaU13GnERrSSdp9tCs1Qm3/DG2RSCQBWTfcgMcStIvKqvJ3IjFn0vGLvI3Ampnq9q1SHwmmzAPSdzcMA76HyMUA5VWaBvWHlUxzIM6unxZASnwvuCzpywSEB5J2OF+p6H+cStJwQ32XwmOG8pLp1srlVWpqZI58Du/lzrkPqONphoZx0LDV86w7RUz1ksDzAdcm0tvmNRFMN1a0frDs506oA3aWK0oDk4Nmvk8sXGTYYw3iQSkOvDUUlIsqdaO+w==
-collect_scripts:
-  syslog: |
-    #!/bin/bash
-    cat /var/log/syslog
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/ssh_import_id.py b/tests/cloud_tests/testcases/modules/ssh_import_id.py
deleted file mode 100644
index ef156f47..00000000
--- a/tests/cloud_tests/testcases/modules/ssh_import_id.py
+++ /dev/null
@@ -1,17 +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 TestSshImportId(base.CloudTestCase):
-    """Test ssh import id module."""
-
-    def test_authorized_keys(self):
-        """Test that ssh keys were imported."""
-        out = self.get_data_file('auth_keys_ubuntu')
-
-        self.assertIn('# ssh-import-id gh:powersj', out)
-        self.assertIn('# ssh-import-id lp:smoser', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/ssh_import_id.yaml b/tests/cloud_tests/testcases/modules/ssh_import_id.yaml
deleted file mode 100644
index b62d3f69..00000000
--- a/tests/cloud_tests/testcases/modules/ssh_import_id.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Import a user's ssh key via gh or lp
-#
-required_features:
-  - ubuntu_user
-  - sudo
-cloud_config: |
-  #cloud-config
-  ssh_import_id:
-    - gh:powersj
-    - lp:smoser
-collect_scripts:
-  auth_keys_ubuntu: |
-    #!/bin/bash
-    cat /home/ubuntu/.ssh/authorized_keys
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/ssh_keys_generate.py b/tests/cloud_tests/testcases/modules/ssh_keys_generate.py
deleted file mode 100644
index b68f5565..00000000
--- a/tests/cloud_tests/testcases/modules/ssh_keys_generate.py
+++ /dev/null
@@ -1,52 +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 TestSshKeysGenerate(base.CloudTestCase):
-    """Test ssh keys module."""
-
-    # TODO: Check cloud-init-output for the correct keys being generated
-
-    def test_dsa_public(self):
-        """Test dsa public key not generated."""
-        out = self.get_data_file('dsa_public')
-        self.assertEqual('', out)
-
-    def test_dsa_private(self):
-        """Test dsa private key not generated."""
-        out = self.get_data_file('dsa_private')
-        self.assertEqual('', out)
-
-    def test_rsa_public(self):
-        """Test rsa public key not generated."""
-        out = self.get_data_file('rsa_public')
-        self.assertEqual('', out)
-
-    def test_rsa_private(self):
-        """Test rsa public key not generated."""
-        out = self.get_data_file('rsa_private')
-        self.assertEqual('', out)
-
-    def test_ecdsa_public(self):
-        """Test ecdsa public key generated."""
-        out = self.get_data_file('ecdsa_public')
-        self.assertIsNotNone(out)
-
-    def test_ecdsa_private(self):
-        """Test ecdsa public key generated."""
-        out = self.get_data_file('ecdsa_private')
-        self.assertIsNotNone(out)
-
-    def test_ed25519_public(self):
-        """Test ed25519 public key generated."""
-        out = self.get_data_file('ed25519_public')
-        self.assertIsNotNone(out)
-
-    def test_ed25519_private(self):
-        """Test ed25519 public key generated."""
-        out = self.get_data_file('ed25519_private')
-        self.assertIsNotNone(out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/ssh_keys_generate.yaml b/tests/cloud_tests/testcases/modules/ssh_keys_generate.yaml
deleted file mode 100644
index 0a7adf62..00000000
--- a/tests/cloud_tests/testcases/modules/ssh_keys_generate.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# SSH keys generated using cloud-init
-#
-required_features:
-  - ubuntu_user
-cloud_config: |
-  #cloud-config
-  ssh_genkeytypes:
-  - ecdsa
-  - ed25519
-  authkey_hash: sha512
-collect_scripts:
-  dsa_public: |
-    #!/bin/bash
-    cat /etc/ssh/ssh_host_dsa_key.pub
-  dsa_private: |
-    #!/bin/bash
-    cat /etc/ssh/ssh_host_dsa_key
-  rsa_public: |
-    #!/bin/bash
-    cat /etc/ssh/ssh_host_rsa_key.pub
-  rsa_private: |
-    #!/bin/bash
-    cat /etc/ssh/ssh_host_rsa_key
-  ecdsa_public: |
-    #!/bin/bash
-    cat /etc/ssh/ssh_host_ecdsa_key.pub
-  ecdsa_private: |
-    #!/bin/bash
-    cat /etc/ssh/ssh_host_ecdsa_key
-  ed25519_public: |
-    #!/bin/bash
-    cat /etc/ssh/ssh_host_ed25519_key.pub
-  ed25519_private: |
-    #!/bin/bash
-    cat /etc/ssh/ssh_host_ed25519_key
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/ssh_keys_provided.py b/tests/cloud_tests/testcases/modules/ssh_keys_provided.py
deleted file mode 100644
index add3f469..00000000
--- a/tests/cloud_tests/testcases/modules/ssh_keys_provided.py
+++ /dev/null
@@ -1,58 +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 TestSshKeysProvided(base.CloudTestCase):
-    """Test ssh keys module."""
-
-    def test_dsa_public(self):
-        """Test dsa public key passed in."""
-        out = self.get_data_file('dsa_public')
-        self.assertIn('AAAAB3NzaC1kc3MAAACBAPkWy1zbchVIN7qTgM0/yyY8q4RZS8c'
-                      'NM4ZpeuE5UB/Nnr6OSU/nmbO8LuM', out)
-
-    def test_dsa_private(self):
-        """Test dsa private key passed in."""
-        out = self.get_data_file('dsa_private')
-        self.assertIn('MIIBuwIBAAKBgQD5Fstc23IVSDe6k4DNP8smPKuEWUvHDTOGaXr'
-                      'hOVAfzZ6+jklP', out)
-
-    def test_rsa_public(self):
-        """Test rsa public key passed in."""
-        out = self.get_data_file('rsa_public')
-        self.assertIn('AAAAB3NzaC1yc2EAAAADAQABAAABAQC0/Ho+o3eJISydO2JvIgT'
-                      'LnZOtrxPl+fSvJfKDjoOLY0HB2eOjy2s2/2N6d9X9SGZ4', out)
-
-    def test_rsa_private(self):
-        """Test rsa public key passed in."""
-        out = self.get_data_file('rsa_private')
-        self.assertIn('4DOkqNiUGl80Zp1RgZNohHUXlJMtAbrIlAVEk+mTmg7vjfyp2un'
-                      'RQvLZpMRdywBm', out)
-
-    def test_ecdsa_public(self):
-        """Test ecdsa public key passed in."""
-        out = self.get_data_file('ecdsa_public')
-        self.assertIn('AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAAB'
-                      'BBFsS5Tvky/IC/dXhE/afxxU', out)
-
-    def test_ecdsa_private(self):
-        """Test ecdsa public key passed in."""
-        out = self.get_data_file('ecdsa_private')
-        self.assertIn('AwEHoUQDQgAEWxLlO+TL8gL91eET9p/HFQbqR1A691AkJgZk3jY'
-                      '5mpZqxgX4vcgb', out)
-
-    def test_ed25519_public(self):
-        """Test ed25519 public key passed in."""
-        out = self.get_data_file('ed25519_public')
-        self.assertIn('AAAAC3NzaC1lZDI1NTE5AAAAINudAZSu4vjZpVWzId5pXmZg1M6'
-                      'G15dqjQ2XkNVOEnb5', out)
-
-    def test_ed25519_private(self):
-        """Test ed25519 public key passed in."""
-        out = self.get_data_file('ed25519_private')
-        self.assertIn('XAAAAAtzc2gtZWQyNTUxOQAAACDbnQGUruL42aVVsyHeaV5mYNT'
-                      'OhteXao0Nl5DVThJ2+Q', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/ssh_keys_provided.yaml b/tests/cloud_tests/testcases/modules/ssh_keys_provided.yaml
deleted file mode 100644
index 41f63550..00000000
--- a/tests/cloud_tests/testcases/modules/ssh_keys_provided.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# SSH keys provided via cloud config
-#
-enabled: False
-required_features:
-  - ubuntu_user
-  - sudo
-cloud_config: |
-  #cloud-config
-  disable_root: false
-  ssh_authorized_keys:
-    - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDXW9Gg5H7ehjdSc6qDzwNtgCy94XYHhEYlXZMO2+FJrH3wfHGiMfCwOHxcOMt2QiXItULthdeQWS9QjBSSjVRXf6731igFrqPFyS9qBlOQ5D29C4HBXFnQggGVpBNJ82IRJv7szbbe/vpgLBP4kttUza9Dr4e1YM1ln4PRnjfXea6T0m+m1ixNb5432pTXlqYOnNOxSIm1gHgMLxPuDrJvQERDKrSiKSjIdyC9Jd8t2e1tkNLY0stmckVRbhShmcJvlyofHWbc2Ca1mmtP7MlS1VQnfLkvU1IrFwkmaQmaggX6WR6coRJ6XFXdWcq/AI2K6GjSnl1dnnCxE8VCEXBlXgFzad+PMSG4yiL5j8Oo1ZVpkTdgBnw4okGqTYCXyZg6X00As9IBNQfZMFlQXlIo4FiWgj3CO5QHQOyOX6FuEumaU13GnERrSSdp9tCs1Qm3/DG2RSCQBWTfcgMcStIvKqvJ3IjFn0vGLvI3Ampnq9q1SHwmmzAPSdzcMA76HyMUA5VWaBvWHlUxzIM6unxZASnwvuCzpywSEB5J2OF+p6H+cStJwQ32XwmOG8pLp1srlVWpqZI58Du/lzrkPqONphoZx0LDV86w7RUz1ksDzAdcm0tvmNRFMN1a0frDs506oA3aWK0oDk4Nmvk8sXGTYYw3iQSkOvDUUlIsqdaO+w==
-  ssh_keys:
-    rsa_private: |
-      -----BEGIN RSA PRIVATE KEY-----
-      MIIEowIBAAKCAQEAtPx6PqN3iSEsnTtibyIEy52Tra8T5fn0ryXyg46Di2NBwdnj
-      o8trNv9jenfV/UhmePl58lXjT43wV8OCMl6KsYXyBdegM35NNtono4I4mLLKFMR9
-      9TOtDn6iYcaNenVhF3ZCj9Z2nNOlTrdc0uchHqKMrxLjCRCUrL91Uf+xioTF901Y
-      RM+ZqC5lT92yAL76F4qPF+Lq1QtUfNfUIwwvOp5ccDZLPxij0YvyBzubYye9hJHu
-      yjbJv78R4JHV+L2WhzSoX3W/6WrxVzeXqFGqH894ccOaC/7tnqSP6V8lIQ6fE2+c
-      DurJcpM3CJRgkndGHjtU55Y71YkcdLksSMvezQIDAQABAoIBAQCrU4IJP8dNeaj5
-      IpkY6NQvR/jfZqfogYi+MKb1IHin/4rlDfUvPcY9pt8ttLlObjYK+OcWn3Vx/sRw
-      4DOkqNiUGl80Zp1RgZNohHUXlJMtAbrIlAVEk+mTmg7vjfyp2unRQvLZpMRdywBm
-      lq95OrCghnG03aUsFJUZPpi5ydnwbA12ma+KHkG0EzaVlhA7X9N6z0K6U+zue2gl
-      goMLt/MH0rsYawkHrwiwXaIFQeyV4MJP0vmrZLbFk1bycu9X/xPtTYotWyWo4eKA
-      cb05uu04qwexkKHDM0KXtT0JecbTo2rOefFo8Uuab6uJY+fEHNocZ+v1vLA4aOxJ
-      ovp1JuXlAoGBAOWYNgKrlTfy5n0sKsNk+1RuL2jHJZJ3HMd0EIt7/fFQN3Fi08Hu
-      jtntqD30Wj+DJK8b8Lrt66FruxyEJm5VhVmwkukrLR5ige2f6ftZnoFCmdyy+0zP
-      dnPZSUe2H5ZPHa+qthJgHLn+al2P04tGh+1fGHC2PbP+e0Co+/ZRIOxrAoGBAMnN
-      IEen9/FRsqvnDd36I8XnJGskVRTZNjylxBmbKcuMWm+gNhOI7gsCAcqzD4BYZjjW
-      pLhrt/u9p+l4MOJy6OUUdM/okg12SnJEGryysOcVBcXyrvOfklWnANG4EAH5jt1N
-      ftTb1XTxzvWVuR/WJK0B5MZNYM71cumBdUDtPi+nAoGAYmoIXMSnxb+8xNL10aOr
-      h9ljQQp8NHgSQfyiSufvRk0YNuYh1vMnEIsqnsPrG2Zfhx/25GmvoxXGssaCorDN
-      5FAn6QK06F1ZTD5L0Y3sv4OI6G1gAuC66ZWuL6sFhyyKkQ4f1WiVZ7SCa3CHQSAO
-      i9VDaKz1bf4bXvAQcNj9v9kCgYACSOZCqW4vN0OUmqsXhkt9ZB6Pb/veno70pNPR
-      jmYsvcwQU3oJQpWfXkhy6RAV3epaXmPDCsUsfns2M3wqNC7a2R5xdCqjKGGzZX4A
-      AO3rz9se4J6Gd5oKijeCKFlWDGNHsibrdgm2pz42nZlY+O21X74dWKbt8O16I1MW
-      hxkbJQKBgAXfuen/srVkJgPuqywUYag90VWCpHsuxdn+fZJa50SyZADr+RbiDfH2
-      vek8Uo8ap8AEsv4Rfs9opUcUZevLp3g2741eOaidHVLm0l4iLIVl03otGOqvSzs+
-      A3tFPEOxauXpzCt8f8eXsz0WQXAgIKW2h8zu5QHjomioU3i27mtE
-      -----END RSA PRIVATE KEY-----
-    rsa_public: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC0/Ho+o3eJISydO2JvIgTLnZOtrxPl+fSvJfKDjoOLY0HB2eOjy2s2/2N6d9X9SGZ4+XnyVeNPjfBXw4IyXoqxhfIF16Azfk022iejgjiYssoUxH31M60OfqJhxo16dWEXdkKP1nac06VOt1zS5yEeooyvEuMJEJSsv3VR/7GKhMX3TVhEz5moLmVP3bIAvvoXio8X4urVC1R819QjDC86nlxwNks/GKPRi/IHO5tjJ72Eke7KNsm/vxHgkdX4vZaHNKhfdb/pavFXN5eoUaofz3hxw5oL/u2epI/pXyUhDp8Tb5wO6slykzcIlGCSd0YeO1TnljvViRx0uSxIy97N root@xenial-lxd
-    dsa_private: |
-      -----BEGIN DSA PRIVATE KEY-----
-      MIIBuwIBAAKBgQD5Fstc23IVSDe6k4DNP8smPKuEWUvHDTOGaXrhOVAfzZ6+jklP
-      55mzvC7jO53PWWC31hq10xBoWdev0WtcNF9Tv+4bAa1263y51Rqo4GI7xx+xic1d
-      mLqqfYijBT9k48J/1tV0cs1Wjs6FP/IJTD/kYVC930JjYQMi722lBnUxsQIVAL7i
-      z3fTGKTvSzvW0wQlwnYpS2QFAoGANp+KdyS9V93HgxGQEN1rlj/TSv/a3EVdCKtE
-      nQf55aPHxDAVDVw5JtRh4pZbbRV4oGRPc9KOdjo5BU28vSM3Lmhkb+UaaDXwHkgI
-      nK193o74DKjADWZxuLyyiKHiMOhxozoxDfjWxs8nz6uqvSW0pr521EwIY6RajbED
-      nZ2a3GkCgYEAyoUomNRB6bmpsIfzt8zdtqLP5umIj2uhr9MVPL8/QdbxmJ72Z7pf
-      Q2z1B7QAdIBGOlqJXtlau7ABhWK29Efe+99ObyTSSdDc6RCDeAwUmBAiPRQhDH2E
-      wExw3doDSCUb28L1B50wBzQ8mC3KXp6C7IkBXWspb16DLHUHFSI8bkICFA5kVUcW
-      nCPOXEQsayANi8+Cb7BH
-      -----END DSA PRIVATE KEY-----
-    dsa_public: ssh-dss AAAAB3NzaC1kc3MAAACBAPkWy1zbchVIN7qTgM0/yyY8q4RZS8cNM4ZpeuE5UB/Nnr6OSU/nmbO8LuM7nc9ZYLfWGrXTEGhZ16/Ra1w0X1O/7hsBrXbrfLnVGqjgYjvHH7GJzV2Yuqp9iKMFP2Tjwn/W1XRyzVaOzoU/8glMP+RhUL3fQmNhAyLvbaUGdTGxAAAAFQC+4s930xik70s71tMEJcJ2KUtkBQAAAIA2n4p3JL1X3ceDEZAQ3WuWP9NK/9rcRV0Iq0SdB/nlo8fEMBUNXDkm1GHillttFXigZE9z0o52OjkFTby9IzcuaGRv5RpoNfAeSAicrX3ejvgMqMANZnG4vLKIoeIw6HGjOjEN+NbGzyfPq6q9JbSmvnbUTAhjpFqNsQOdnZrcaQAAAIEAyoUomNRB6bmpsIfzt8zdtqLP5umIj2uhr9MVPL8/QdbxmJ72Z7pfQ2z1B7QAdIBGOlqJXtlau7ABhWK29Efe+99ObyTSSdDc6RCDeAwUmBAiPRQhDH2EwExw3doDSCUb28L1B50wBzQ8mC3KXp6C7IkBXWspb16DLHUHFSI8bkI= root@xenial-lxd
-    ed25519_private: |
-      -----BEGIN OPENSSH PRIVATE KEY-----
-      b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
-      QyNTUxOQAAACDbnQGUruL42aVVsyHeaV5mYNTOhteXao0Nl5DVThJ2+QAAAJgwt+lcMLfp
-      XAAAAAtzc2gtZWQyNTUxOQAAACDbnQGUruL42aVVsyHeaV5mYNTOhteXao0Nl5DVThJ2+Q
-      AAAEDQlFZpz9q8+/YJHS9+jPAqy2ZT6cGEv8HTB6RZtTjd/dudAZSu4vjZpVWzId5pXmZg
-      1M6G15dqjQ2XkNVOEnb5AAAAD3Jvb3RAeGVuaWFsLWx4ZAECAwQFBg==
-      -----END OPENSSH PRIVATE KEY-----
-    ed25519_public: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINudAZSu4vjZpVWzId5pXmZg1M6G15dqjQ2XkNVOEnb5 root@xenial-lxd
-    ecdsa_private: |
-      -----BEGIN EC PRIVATE KEY-----
-      MHcCAQEEIDuK+QFc1wmyJY8uDqQVa1qHte30Rk/fdLxGIBkwJAyOoAoGCCqGSM49
-      AwEHoUQDQgAEWxLlO+TL8gL91eET9p/HFQbqR1A691AkJgZk3jY5mpZqxgX4vcgb
-      7f/CtXuM6s2svcDJqAeXr6Wk8OJJcMxylA==
-      -----END EC PRIVATE KEY-----
-    ecdsa_public: ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFsS5Tvky/IC/dXhE/afxxUG6kdQOvdQJCYGZN42OZqWasYF+L3IG+3/wrV7jOrNrL3AyagHl6+lpPDiSXDMcpQ= root@xenial-lxd
-collect_scripts:
-  dsa_public: |
-    #!/bin/bash
-    cat /etc/ssh/ssh_host_dsa_key.pub
-  dsa_private: |
-    #!/bin/bash
-    cat /etc/ssh/ssh_host_dsa_key
-  rsa_public: |
-    #!/bin/bash
-    cat /etc/ssh/ssh_host_rsa_key.pub
-  rsa_private: |
-    #!/bin/bash
-    cat /etc/ssh/ssh_host_rsa_key
-  ecdsa_public: |
-    #!/bin/bash
-    cat /etc/ssh/ssh_host_ecdsa_key.pub
-  ecdsa_private: |
-    #!/bin/bash
-    cat /etc/ssh/ssh_host_ecdsa_key
-  ed25519_public: |
-    #!/bin/bash
-    cat /etc/ssh/ssh_host_ed25519_key.pub
-  ed25519_private: |
-    #!/bin/bash
-    cat /etc/ssh/ssh_host_ed25519_key
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/timezone.py b/tests/cloud_tests/testcases/modules/timezone.py
deleted file mode 100644
index 654fa53d..00000000
--- a/tests/cloud_tests/testcases/modules/timezone.py
+++ /dev/null
@@ -1,15 +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 TestTimezone(base.CloudTestCase):
-    """Test timezone module."""
-
-    def test_timezone(self):
-        """Test date prints correct timezone."""
-        out = self.get_data_file('timezone')
-        self.assertEqual('HDT', out.rstrip())
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/timezone.yaml b/tests/cloud_tests/testcases/modules/timezone.yaml
deleted file mode 100644
index 5112aa9f..00000000
--- a/tests/cloud_tests/testcases/modules/timezone.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Set system timezone
-#
-required_features:
-  - daylight_time
-cloud_config: |
-  #cloud-config
-  timezone: US/Aleutian
-collect_scripts:
-  timezone: |
-    #!/bin/bash
-    # date will convert this to system's configured time zone.
-    # use a static date to avoid dealing with daylight savings.
-    date "+%Z" --date="Thu, 03 Nov 2016 00:47:00 -0400"
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/user_groups.py b/tests/cloud_tests/testcases/modules/user_groups.py
deleted file mode 100644
index 4067348d..00000000
--- a/tests/cloud_tests/testcases/modules/user_groups.py
+++ /dev/null
@@ -1,49 +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 TestUserGroups(base.CloudTestCase):
-    """Example cloud-config test."""
-
-    def test_group_ubuntu(self):
-        """Test ubuntu group exists."""
-        out = self.get_data_file('group_ubuntu')
-        self.assertRegex(out, r'ubuntu:x:[0-9]{4}:')
-
-    def test_group_cloud_users(self):
-        """Test cloud users group exists."""
-        out = self.get_data_file('group_cloud_users')
-        self.assertRegex(out, r'cloud-users:x:[0-9]{4}:barfoo')
-
-    def test_user_ubuntu(self):
-        """Test ubuntu user exists."""
-        out = self.get_data_file('user_ubuntu')
-        self.assertRegex(
-            out, r'ubuntu:x:[0-9]{4}:[0-9]{4}:Ubuntu:/home/ubuntu:/bin/bash')
-
-    def test_user_foobar(self):
-        """Test foobar user exists."""
-        out = self.get_data_file('user_foobar')
-        self.assertRegex(
-            out, r'foobar:x:[0-9]{4}:[0-9]{4}:Foo B. Bar:/home/foobar:')
-
-    def test_user_barfoo(self):
-        """Test barfoo user exists."""
-        out = self.get_data_file('user_barfoo')
-        self.assertRegex(
-            out, r'barfoo:x:[0-9]{4}:[0-9]{4}:Bar B. Foo:/home/barfoo:')
-
-    def test_user_cloudy(self):
-        """Test cloudy user exists."""
-        out = self.get_data_file('user_cloudy')
-        self.assertRegex(out, r'cloudy:x:[0-9]{3,4}:')
-
-    def test_user_root_in_secret(self):
-        """Test root user is in 'secret' group."""
-        _user, _, groups = self.get_data_file('root_groups').partition(":")
-        self.assertIn("secret", groups.split(),
-                      msg="User root is not in group 'secret'")
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/user_groups.yaml b/tests/cloud_tests/testcases/modules/user_groups.yaml
deleted file mode 100644
index 91b0e281..00000000
--- a/tests/cloud_tests/testcases/modules/user_groups.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Create groups and users with various options
-#
-required_features:
-  - ubuntu_user
-cloud_config: |
-  #cloud-config
-  # Add groups to the system
-  groups:
-    - secret: [root]
-    - cloud-users
-
-  # Add users to the system. Users are added after groups are added.
-  users:
-    - default
-    - name: foobar
-      gecos: Foo B. Bar
-      primary_group: foobar
-      groups: users
-      expiredate: '2038-01-19'
-      lock_passwd: false
-      passwd: $6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/
-    - name: barfoo
-      gecos: Bar B. Foo
-      sudo: ALL=(ALL) NOPASSWD:ALL
-      groups: [cloud-users, secret]
-      lock_passwd: true
-    - name: cloudy
-      gecos: Magic Cloud App Daemon User
-      inactive: '5'
-      system: true
-collect_scripts:
-  group_ubuntu: |
-    #!/bin/bash
-    getent group ubuntu
-  group_cloud_users: |
-    #!/bin/bash
-    getent group cloud-users
-  user_ubuntu: |
-    #!/bin/bash
-    getent passwd ubuntu
-  user_foobar: |
-    #!/bin/bash
-    getent passwd foobar
-  user_barfoo: |
-    #!/bin/bash
-    getent passwd barfoo
-  user_cloudy: |
-    #!/bin/bash
-    getent passwd cloudy
-  root_groups: |
-    #!/bin/bash
-    groups root
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/write_files.py b/tests/cloud_tests/testcases/modules/write_files.py
deleted file mode 100644
index 526a2ebd..00000000
--- a/tests/cloud_tests/testcases/modules/write_files.py
+++ /dev/null
@@ -1,33 +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 TestWriteFiles(base.CloudTestCase):
-    """Example cloud-config test."""
-
-    def test_b64(self):
-        """Test b64 encoded file reads as ascii."""
-        out = self.get_data_file('file_b64')
-        self.assertIn('ASCII text', out)
-
-    def test_binary(self):
-        """Test binary file reads as executable."""
-        out = self.get_data_file('file_binary').strip()
-        md5 = "3801184b97bb8c6e63fa0e1eae2920d7"
-        sha256 = ("2c791c4037ea5bd7e928d6a87380f8ba7a803cd83d"
-                  "5e4f269e28f5090f0f2c9a")
-        self.assertIn(out, (md5 + "  -", sha256 + "  -"))
-
-    def test_gzip(self):
-        """Test gzip file shows up as a shell script."""
-        out = self.get_data_file('file_gzip')
-        self.assertIn('POSIX shell script, ASCII text executable', out)
-
-    def test_text(self):
-        """Test text shows up as ASCII text."""
-        out = self.get_data_file('file_text')
-        self.assertIn('ASCII text', out)
-
-# vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/write_files.yaml b/tests/cloud_tests/testcases/modules/write_files.yaml
deleted file mode 100644
index cc7ea4bd..00000000
--- a/tests/cloud_tests/testcases/modules/write_files.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Write various file types
-#
-# NOTE: on trusty 'file' has an output formatting error for binary files and
-#       has 2 spaces in 'LSB  executable', which causes a failure here
-#
-# NOTE: the binary data can be any binary data, not only executables
-#       and can be generated via the base 64 command as such:
-#           $ base64 < hello > hello.txt
-#       the opposite is running:
-#           $ base64 -d < hello.txt > hello
-#
-required_features:
-  - no_file_fmt_e
-cloud_config: |
-  #cloud-config
-  write_files:
-  -   encoding: b64
-      content: CiMgVGhpcyBmaWxlIGNvbnRyb2xzIHRoZSBzdGF0ZSBvZiBTRUxpbnV4
-      owner: root:root
-      path: /root/file_b64
-      permissions: '0644'
-  -   content: |
-          # My new /root/file_text
-
-          SMBDOPTIONS="-D"
-      path: /root/file_text
-  -   content: !!binary |
-          /Z/xrHR4WINT0UNoKPQKbuovp6+Js+JK
-      path: /root/file_binary
-      permissions: '0555'
-  -   encoding: gzip
-      content: !!binary |
-          H4sIAIDb/U8C/1NW1E/KzNMvzuBKTc7IV8hIzcnJVyjPL8pJ4QIA6N+MVxsAAAA=
-      path: /root/file_gzip
-      permissions: '0755'
-collect_scripts:
-  file_b64: |
-    #!/bin/bash
-    file /root/file_b64
-  file_text: |
-    #!/bin/bash
-    file /root/file_text
-  file_binary: |
-    #!/bin/bash
-    for hasher in md5sum sha256sum; do
-        $hasher </root/file_binary && break
-    done
-  file_gzip: |
-    #!/bin/bash
-    file /root/file_gzip
-
-# vi: ts=4 expandtab