4 files changed, 20 insertions, 4 deletions
diff --git a/systemd/cloud-config.service b/systemd/cloud-config.service
index 696230f6..fc72fc48 100644
--- a/systemd/cloud-config.service
+++ b/systemd/cloud-config.service
@@ -6,8 +6,12 @@ Wants=network.target
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/cloud-init-cfg all config
+ExecStart=/usr/bin/cloud-init modules --mode=config
 RemainAfterExit=yes
+TimeoutSec=0
+
+# Output needs to appear in instance console output
+StandardOutput=tty
 
 [Install]
 WantedBy=multi-user.target
diff --git a/systemd/cloud-final.service b/systemd/cloud-final.service
index 23275ee5..f836eab6 100644
--- a/systemd/cloud-final.service
+++ b/systemd/cloud-final.service
@@ -6,8 +6,12 @@ Wants=network.target
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/cloud-init-cfg all final
+ExecStart=/usr/bin/cloud-init modules --mode=final
 RemainAfterExit=yes
+TimeoutSec=0
+
+# Output needs to appear in instance console output
+StandardOutput=tty
 
 [Install]
 WantedBy=multi-user.target
diff --git a/systemd/cloud-init-local.service b/systemd/cloud-init-local.service
index 2d57567f..6a551710 100644
--- a/systemd/cloud-init-local.service
+++ b/systemd/cloud-init-local.service
@@ -5,8 +5,12 @@ After=local-fs.target
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/cloud-init start-local
+ExecStart=/usr/bin/cloud-init init --local
 RemainAfterExit=yes
+TimeoutSec=0
+
+# Output needs to appear in instance console output
+StandardOutput=tty
 
 [Install]
 WantedBy=multi-user.target
diff --git a/systemd/cloud-init.service b/systemd/cloud-init.service
index b8f6f49d..d4eb9fa5 100644
--- a/systemd/cloud-init.service
+++ b/systemd/cloud-init.service
@@ -6,8 +6,12 @@ Wants=local-fs.target cloud-init-local.service
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/cloud-init start
+ExecStart=/usr/bin/cloud-init init
 RemainAfterExit=yes
+TimeoutSec=0
+
+# Output needs to appear in instance console output
+StandardOutput=tty
 
 [Install]
 WantedBy=multi-user.target