diff options
| author | Scott Moser <smoser@brickies.net> | 2016-09-09 16:00:55 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-09-09 16:00:55 -0400 |
| commit | 6baa2c684e83812149b367073352eb8d754c8591 (patch) | |
| tree | 1cc74a65bf1500c8cf0e316c80eac77f464976d8 | |
| parent | 314aac21a2f096917f4f92ed61bdf832ba446ae5 (diff) | |
| parent | 34a26f7f59f2963691e36ca0476bec9fc9ccef63 (diff) | |
| download | vyos-cloud-init-6baa2c684e83812149b367073352eb8d754c8591.tar.gz vyos-cloud-init-6baa2c684e83812149b367073352eb8d754c8591.zip | |
merge from master at 0.7.7-28-g34a26f7
| -rw-r--r-- | config/cloud.cfg | 16 | ||||
| -rw-r--r-- | systemd/cloud-final.service | 2 | ||||
| -rw-r--r-- | tests/unittests/test_handler/test_handler_apt_source_v3.py | 1 |
3 files changed, 10 insertions, 9 deletions
diff --git a/config/cloud.cfg b/config/cloud.cfg index 2d7fb473..7c94ec5c 100644 --- a/config/cloud.cfg +++ b/config/cloud.cfg @@ -49,25 +49,25 @@ cloud_config_modules: - ssh-import-id - locale - set-passwords - - snappy - grub-dpkg - apt-pipelining - apt-configure + - timezone + - disable-ec2-metadata + - runcmd + - byobu + +# The modules that run in the 'final' stage +cloud_final_modules: + - snappy - package-update-upgrade-install - fan - landscape - - timezone - lxd - puppet - chef - salt-minion - mcollective - - disable-ec2-metadata - - runcmd - - byobu - -# The modules that run in the 'final' stage -cloud_final_modules: - rightscale_userdata - scripts-vendor - scripts-per-once diff --git a/systemd/cloud-final.service b/systemd/cloud-final.service index 3927710f..b8f69b78 100644 --- a/systemd/cloud-final.service +++ b/systemd/cloud-final.service @@ -1,6 +1,6 @@ [Unit] Description=Execute cloud user/final scripts -After=network-online.target cloud-config.service rc-local.service +After=network-online.target cloud-config.service rc-local.service multi-user.target Wants=network-online.target cloud-config.service [Service] diff --git a/tests/unittests/test_handler/test_handler_apt_source_v3.py b/tests/unittests/test_handler/test_handler_apt_source_v3.py index 75556b6d..b92a50d7 100644 --- a/tests/unittests/test_handler/test_handler_apt_source_v3.py +++ b/tests/unittests/test_handler/test_handler_apt_source_v3.py @@ -63,6 +63,7 @@ class TestAptSourceConfig(t_help.FilesystemMockingTestCase): self.tmp = tempfile.mkdtemp() self.new_root = tempfile.mkdtemp() self.addCleanup(shutil.rmtree, self.tmp) + self.addCleanup(shutil.rmtree, self.new_root) self.aptlistfile = os.path.join(self.tmp, "single-deb.list") self.aptlistfile2 = os.path.join(self.tmp, "single-deb2.list") self.aptlistfile3 = os.path.join(self.tmp, "single-deb3.list") |