From 569b5c6eb1dfa3316bbc03ac74cfc99c8e5dd176 Mon Sep 17 00:00:00 2001 From: David Duncan Date: Tue, 22 Dec 2020 01:46:33 +0000 Subject: [PATCH 1/3] Enable qemu-guest-agent on cloud, not GCP. cloud-sig/issue/319 Signed-off-by: David Duncan --- fedora-cloud-base-gcp.ks | 3 +++ fedora-cloud-base.ks | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/fedora-cloud-base-gcp.ks b/fedora-cloud-base-gcp.ks index 3753d78..2b68ddf 100644 --- a/fedora-cloud-base-gcp.ks +++ b/fedora-cloud-base-gcp.ks @@ -12,6 +12,9 @@ bootloader --timeout=0 --append="no_timer_check net.ifnames=0 console=ttyS0,38400n8d" #%packages +# Fedora Cloud Base includes the qemu guest agent. GCP prefers +# that it not be installed https://pagure.io/cloud-sig/issue/319 +-qemu-guest-agent #%end %post --erroronfail diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks index 5bc1078..38dcfa1 100644 --- a/fedora-cloud-base.ks +++ b/fedora-cloud-base.ks @@ -67,6 +67,13 @@ kernel-core # rhgb/quiet on kernel command line -plymouth +# Enable qemu-guest-agent https://pagure.io/cloud-sig/issue/319 To +# improve the integration with OpenStack and other VM management +# systems (oVirt, KubeVirt), each user would have to install and +# enable qemu-guest-agent on it before usage. +qemu-guest-agent + + # No need for firewalld for now. We don't have a firewall on by default. -firewalld From 35042d405817387b582b186513a9271d36043ac9 Mon Sep 17 00:00:00 2001 From: David Duncan Date: Wed, 23 Dec 2020 10:41:39 -0500 Subject: [PATCH 2/3] uncomment packages section Signed-off-by: David Duncan --- fedora-cloud-base-gcp.ks | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fedora-cloud-base-gcp.ks b/fedora-cloud-base-gcp.ks index 2b68ddf..c7dc4cf 100644 --- a/fedora-cloud-base-gcp.ks +++ b/fedora-cloud-base-gcp.ks @@ -11,11 +11,11 @@ # https://cloud.google.com/compute/docs/import/import-existing-image bootloader --timeout=0 --append="no_timer_check net.ifnames=0 console=ttyS0,38400n8d" -#%packages +%packages # Fedora Cloud Base includes the qemu guest agent. GCP prefers # that it not be installed https://pagure.io/cloud-sig/issue/319 -qemu-guest-agent -#%end +%end %post --erroronfail cat < /etc/NetworkManager/conf.d/gcp-mtu.conf From 1e02ceba06a390633fce61bdc9a5eb47653aefa1 Mon Sep 17 00:00:00 2001 From: David Duncan Date: Tue, 5 Jan 2021 03:40:53 +0000 Subject: [PATCH 3/3] Improve ambiguous comment per review --- fedora-cloud-base.ks | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks index 38dcfa1..ca33a7a 100644 --- a/fedora-cloud-base.ks +++ b/fedora-cloud-base.ks @@ -67,10 +67,9 @@ kernel-core # rhgb/quiet on kernel command line -plymouth -# Enable qemu-guest-agent https://pagure.io/cloud-sig/issue/319 To +# Install qemu-guest-agent https://pagure.io/cloud-sig/issue/319 To # improve the integration with OpenStack and other VM management -# systems (oVirt, KubeVirt), each user would have to install and -# enable qemu-guest-agent on it before usage. +# systems (oVirt, KubeVirt). qemu-guest-agent