diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-19 16:13:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-19 16:13:47 +0200 |
| commit | 7be87f5551ca36d30518dcd62d623c4d45bb830b (patch) | |
| tree | 61f121eaa333ccd70bf80bca68221aca19d9beb4 /contrib/cirrus/packer/fedora_base-setup.sh | |
| parent | 589b12dbc9e4efab3e98cda01b1e47f93e846586 (diff) | |
| parent | ab3105a46d18136c8be7416b46100df23282b9a1 (diff) | |
| download | podman-7be87f5551ca36d30518dcd62d623c4d45bb830b.tar.gz podman-7be87f5551ca36d30518dcd62d623c4d45bb830b.tar.bz2 podman-7be87f5551ca36d30518dcd62d623c4d45bb830b.zip | |
Merge pull request #3078 from cevich/cirrus_f30
Cirrus F30
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!" |