From d1c6ad4a9bfaba86e101642330bd478d9badd361 Mon Sep 17 00:00:00 2001 From: Garrett Holmstrom <gholms@eucalyptus.com> Date: Fri, 3 Aug 2012 13:49:59 -0700 Subject: systemd: write stdout to tty so it shows up in GetConsoleOutput --- systemd/cloud-config.service | 3 +++ systemd/cloud-final.service | 3 +++ systemd/cloud-init-local.service | 3 +++ systemd/cloud-init.service | 3 +++ 4 files changed, 12 insertions(+) (limited to 'systemd') diff --git a/systemd/cloud-config.service b/systemd/cloud-config.service index 696230f6..f08049da 100644 --- a/systemd/cloud-config.service +++ b/systemd/cloud-config.service @@ -9,5 +9,8 @@ Type=oneshot ExecStart=/usr/bin/cloud-init-cfg all config RemainAfterExit=yes +# 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..19aa02b9 100644 --- a/systemd/cloud-final.service +++ b/systemd/cloud-final.service @@ -9,5 +9,8 @@ Type=oneshot ExecStart=/usr/bin/cloud-init-cfg all final RemainAfterExit=yes +# 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..bce81fe7 100644 --- a/systemd/cloud-init-local.service +++ b/systemd/cloud-init-local.service @@ -8,5 +8,8 @@ Type=oneshot ExecStart=/usr/bin/cloud-init start-local RemainAfterExit=yes +# 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..b204f5cc 100644 --- a/systemd/cloud-init.service +++ b/systemd/cloud-init.service @@ -9,5 +9,8 @@ Type=oneshot ExecStart=/usr/bin/cloud-init start RemainAfterExit=yes +# Output needs to appear in instance console output +StandardOutput=tty + [Install] WantedBy=multi-user.target -- cgit v1.2.3 From e44dc25e34c97bd53c373567be817b65e9ef3b09 Mon Sep 17 00:00:00 2001 From: Garrett Holmstrom <gholms@eucalyptus.com> Date: Fri, 3 Aug 2012 14:01:13 -0700 Subject: systemd: update program calling formats --- systemd/cloud-config.service | 2 +- systemd/cloud-final.service | 2 +- systemd/cloud-init-local.service | 2 +- systemd/cloud-init.service | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'systemd') diff --git a/systemd/cloud-config.service b/systemd/cloud-config.service index f08049da..8bc09c94 100644 --- a/systemd/cloud-config.service +++ b/systemd/cloud-config.service @@ -6,7 +6,7 @@ Wants=network.target [Service] Type=oneshot -ExecStart=/usr/bin/cloud-init-cfg all config +ExecStart=/usr/bin/cloud-init modules --mode=config RemainAfterExit=yes # Output needs to appear in instance console output diff --git a/systemd/cloud-final.service b/systemd/cloud-final.service index 19aa02b9..684b9ec3 100644 --- a/systemd/cloud-final.service +++ b/systemd/cloud-final.service @@ -6,7 +6,7 @@ Wants=network.target [Service] Type=oneshot -ExecStart=/usr/bin/cloud-init-cfg all final +ExecStart=/usr/bin/cloud-init modules --mode=final RemainAfterExit=yes # Output needs to appear in instance console output diff --git a/systemd/cloud-init-local.service b/systemd/cloud-init-local.service index bce81fe7..b605c3e2 100644 --- a/systemd/cloud-init-local.service +++ b/systemd/cloud-init-local.service @@ -5,7 +5,7 @@ After=local-fs.target [Service] Type=oneshot -ExecStart=/usr/bin/cloud-init start-local +ExecStart=/usr/bin/cloud-init init --local RemainAfterExit=yes # Output needs to appear in instance console output diff --git a/systemd/cloud-init.service b/systemd/cloud-init.service index b204f5cc..be07df3b 100644 --- a/systemd/cloud-init.service +++ b/systemd/cloud-init.service @@ -6,7 +6,7 @@ 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 # Output needs to appear in instance console output -- cgit v1.2.3 From 3ac504a49a3755e58f6e74b7a17f98f3d4a4eb0c Mon Sep 17 00:00:00 2001 From: Garrett Holmstrom <gholms@eucalyptus.com> Date: Fri, 3 Aug 2012 14:40:42 -0700 Subject: systemd: disable timeouts so cloud-config jobs have time to finish --- systemd/cloud-config.service | 1 + systemd/cloud-final.service | 1 + systemd/cloud-init-local.service | 1 + systemd/cloud-init.service | 1 + 4 files changed, 4 insertions(+) (limited to 'systemd') diff --git a/systemd/cloud-config.service b/systemd/cloud-config.service index 8bc09c94..fc72fc48 100644 --- a/systemd/cloud-config.service +++ b/systemd/cloud-config.service @@ -8,6 +8,7 @@ Wants=network.target Type=oneshot ExecStart=/usr/bin/cloud-init modules --mode=config RemainAfterExit=yes +TimeoutSec=0 # Output needs to appear in instance console output StandardOutput=tty diff --git a/systemd/cloud-final.service b/systemd/cloud-final.service index 684b9ec3..f836eab6 100644 --- a/systemd/cloud-final.service +++ b/systemd/cloud-final.service @@ -8,6 +8,7 @@ Wants=network.target Type=oneshot ExecStart=/usr/bin/cloud-init modules --mode=final RemainAfterExit=yes +TimeoutSec=0 # Output needs to appear in instance console output StandardOutput=tty diff --git a/systemd/cloud-init-local.service b/systemd/cloud-init-local.service index b605c3e2..6a551710 100644 --- a/systemd/cloud-init-local.service +++ b/systemd/cloud-init-local.service @@ -7,6 +7,7 @@ After=local-fs.target Type=oneshot ExecStart=/usr/bin/cloud-init init --local RemainAfterExit=yes +TimeoutSec=0 # Output needs to appear in instance console output StandardOutput=tty diff --git a/systemd/cloud-init.service b/systemd/cloud-init.service index be07df3b..d4eb9fa5 100644 --- a/systemd/cloud-init.service +++ b/systemd/cloud-init.service @@ -8,6 +8,7 @@ Wants=local-fs.target cloud-init-local.service Type=oneshot ExecStart=/usr/bin/cloud-init init RemainAfterExit=yes +TimeoutSec=0 # Output needs to appear in instance console output StandardOutput=tty -- cgit v1.2.3