cloud-init-dev team mailing list archive

[Garrett Holmstrom <gholms@xxxxxxxxxxxxxxxxx>]

Garrett Holmstrom has proposed merging lp:~gholms/cloud-init/systemd-cleanup into lp:cloud-init.

Requested reviews:
  cloud init development team (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~gholms/cloud-init/systemd-cleanup/+merge/122185

The systemd unit files are somewhat out of date.  Fixes here include telling systemd to send stdout to a tty so it shows up in console output, updating the ways they call cloud-init, and disabling timeouts so cloud-config work doesn't get timed out after 90 seconds.
-- 
https://code.launchpad.net/~gholms/cloud-init/systemd-cleanup/+merge/122185
Your team cloud init development team is requested to review the proposed merge of lp:~gholms/cloud-init/systemd-cleanup into lp:cloud-init.

=== modified file 'systemd/cloud-config.service'
--- systemd/cloud-config.service	2011-10-30 21:14:09 +0000
+++ systemd/cloud-config.service	2012-08-31 02:43:21 +0000
@@ -6,8 +6,12 @@
 
 [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

=== modified file 'systemd/cloud-final.service'
--- systemd/cloud-final.service	2011-10-30 21:14:09 +0000
+++ systemd/cloud-final.service	2012-08-31 02:43:21 +0000
@@ -6,8 +6,12 @@
 
 [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

=== modified file 'systemd/cloud-init-local.service'
--- systemd/cloud-init-local.service	2011-10-30 21:14:09 +0000
+++ systemd/cloud-init-local.service	2012-08-31 02:43:21 +0000
@@ -5,8 +5,12 @@
 
 [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

=== modified file 'systemd/cloud-init.service'
--- systemd/cloud-init.service	2011-10-30 21:14:09 +0000
+++ systemd/cloud-init.service	2012-08-31 02:43:21 +0000
@@ -6,8 +6,12 @@
 
 [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