diff options
| author | Chris Evich <cevich@redhat.com> | 2019-05-07 13:31:04 -0400 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2019-06-14 13:41:58 -0400 |
| commit | 11484580d35c7310242303fa0728e3681462f37f (patch) | |
| tree | 395230c6548e18f63779e0f98631efe3ac3bed30 /contrib/cirrus/packer/fedora_base-setup.sh | |
| parent | 60a857db6293fcf012e218f133c369ec5a8065ba (diff) | |
| download | podman-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/fedora_base-setup.sh')
| -rw-r--r-- | contrib/cirrus/packer/fedora_base-setup.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/contrib/cirrus/packer/fedora_base-setup.sh b/contrib/cirrus/packer/fedora_base-setup.sh index 2e6d3eceb..a425b2b57 100644 --- a/contrib/cirrus/packer/fedora_base-setup.sh +++ b/contrib/cirrus/packer/fedora_base-setup.sh @@ -16,11 +16,17 @@ echo "Updating packages" ooe.sh dnf -y update echo "Installing necessary packages and google services" -ooe.sh dnf -y install rng-tools google-compute-engine-tools google-compute-engine-oslogin +ooe.sh dnf -y install rng-tools google-compute-engine-tools google-compute-engine-oslogin ethtool echo "Enabling services" ooe.sh systemctl enable rngd +# There is a race that can happen on boot between the GCE services configuring +# the VM, and cloud-init trying to do similar activities. Use a customized +# unit file to make sure cloud-init starts after the google-compute-* services. +echo "Setting cloud-init service to start after google-network-daemon.service" +cp -v $GOSRC/$PACKER_BASE/cloud-init/fedora/cloud-init.service /etc/systemd/system/ + rh_finalize echo "SUCCESS!" |