From 636deb452d4b448bac4ee83f2a49939982385fe6 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@brickies.net>
Date: Thu, 8 Sep 2016 11:41:13 -0400
Subject: tests: cleanup tempdirs in apt_source tests

test_handler_apt_source_v3.py was not cleaning up all its tmp dirs.
---
 tests/unittests/test_handler/test_handler_apt_source_v3.py | 1 +
 1 file changed, 1 insertion(+)

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")
-- 
cgit v1.2.3


From 34a26f7f59f2963691e36ca0476bec9fc9ccef63 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@brickies.net>
Date: Thu, 8 Sep 2016 13:17:37 -0400
Subject: systemd: Better support package and upgrade.

In systemd, package installation before the system is fully booted
(systemctl is-system-running ==  starting) may result in the package not
being started.  Upgrade (package_upgrade: true) can also cause failure if
that is done during systemd boot.

The solution here is:
 a.) move config modules that do or may do package installation to
     'final_modules'. That list is:
     - snappy
     - package-update-upgrade-install
     - fan
     - landscape
     - lxd
     - puppet
     - chef
     - salt-minion
     - mcollective
 b.) move cloud-final.service to run as 'Type=idle'

LP: #1576692, #1621336
---
 config/cloud.cfg            | 16 ++++++++--------
 systemd/cloud-final.service |  2 +-
 2 files changed, 9 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]
-- 
cgit v1.2.3