summaryrefslogtreecommitdiff
path: root/contrib/cirrus/packer/cloud-init
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2019-05-07 13:31:04 -0400
committerChris Evich <cevich@redhat.com>2019-06-14 13:41:58 -0400
commit11484580d35c7310242303fa0728e3681462f37f (patch)
tree395230c6548e18f63779e0f98631efe3ac3bed30 /contrib/cirrus/packer/cloud-init
parent60a857db6293fcf012e218f133c369ec5a8065ba (diff)
downloadpodman-11484580d35c7310242303fa0728e3681462f37f.tar.gz
podman-11484580d35c7310242303fa0728e3681462f37f.tar.bz2
podman-11484580d35c7310242303fa0728e3681462f37f.zip
Cirrus: Add support for testing F30
Remove disused `build_cache_images` task, and update relevant dockerfiles for F30. Fix problem of cloud-init failing to expand root-device on boot (/var/lib/cloud/instance left in improper state). Fix problem of cloud-init racing with google-network-daemon.service on boot (looking for cloudconfig metadata too early). Causing root-device to _sometimes_ fail to expand. Fix problem of hack/get_ci_vm.sh argument passing. Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus/packer/cloud-init')
-rw-r--r--contrib/cirrus/packer/cloud-init/fedora/cloud-init.service20
1 files changed, 20 insertions, 0 deletions
diff --git a/contrib/cirrus/packer/cloud-init/fedora/cloud-init.service b/contrib/cirrus/packer/cloud-init/fedora/cloud-init.service
new file mode 100644
index 000000000..4d2197d87
--- /dev/null
+++ b/contrib/cirrus/packer/cloud-init/fedora/cloud-init.service
@@ -0,0 +1,20 @@
+[Unit]
+Description=Initial cloud-init job (metadata service crawler)
+DefaultDependencies=no
+Wants=cloud-init-local.service
+After=cloud-init-local.service
+Wants=google-network-daemon.service
+After=google-network-daemon.service
+Before=systemd-user-sessions.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/cloud-init init
+RemainAfterExit=yes
+TimeoutSec=0
+
+# Output needs to appear in instance console output
+StandardOutput=journal+console
+
+[Install]
+WantedBy=cloud-init.target