summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/cloud.cfg16
-rw-r--r--systemd/cloud-final.service2
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]