From 5b3f3881d62d4230e7564f62fb187471e88a86cd Mon Sep 17 00:00:00 2001 From: Sunil Thaha Date: Mon, 18 Apr 2022 05:39:43 +1000 Subject: [PATCH 1/3] Add Fedora 34 to the list of supported images (#72) Signed-off-by: Sunil Thaha <3005132+sthaha@users.noreply.github.com> --- kvm-install-vm | 11 ++++++++++- tests/check_distributions.bats | 8 ++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/kvm-install-vm b/kvm-install-vm index 51f3ef5..0f7db8c 100755 --- a/kvm-install-vm +++ b/kvm-install-vm @@ -83,6 +83,7 @@ function usage_subcommand () printf " fedora31 Fedora 31 fedora\n" printf " fedora32 Fedora 32 fedora\n" printf " fedora33 Fedora 33 fedora\n" + printf " fedora34 Fedora 34 fedora\n" printf " opensuse15 OpenSUSE Leap 15.2 opensuse\n" printf " ubuntu1604 Ubuntu 16.04 LTS (Xenial Xerus) ubuntu\n" printf " ubuntu1804 Ubuntu 18.04 LTS (Bionic Beaver) ubuntu\n" @@ -268,7 +269,7 @@ function delete_vm () else output "Domain ${VMNAME} does not exist" fi - + [[ -d ${VMDIR}/${VMNAME} ]] && DISKDIR=${VMDIR}/${VMNAME} || DISKDIR=${IMAGEDIR}/${VMNAME} [ -d $DISKDIR ] \ && outputn "Deleting ${VMNAME} files" \ @@ -405,6 +406,14 @@ function fetch_images () DISK_FORMAT=qcow2 LOGIN_USER=fedora ;; + fedora34) + QCOW=Fedora-Cloud-Base-34-1.2.x86_64.qcow2 + OS_TYPE="linux" + OS_VARIANT="fedora34" + IMAGE_URL=https://download.fedoraproject.org/pub/fedora/linux/releases/34/Cloud/x86_64/images + DISK_FORMAT=qcow2 + LOGIN_USER=fedora + ;; ubuntu1604) QCOW=ubuntu-16.04-server-cloudimg-amd64-disk1.img OS_TYPE="linux" diff --git a/tests/check_distributions.bats b/tests/check_distributions.bats index 98584bf..fb6c68b 100644 --- a/tests/check_distributions.bats +++ b/tests/check_distributions.bats @@ -88,6 +88,14 @@ function remove_test_vm () remove_test_vm fedora33 } +@test "Install VM (Fedora 34) - $VMNAME-fedora34" { + create_test_vm fedora34 +} + +@test "Delete VM (Fedora 34) - $VMNAME-fedora34" { + remove_test_vm fedora34 +} + @test "Install VM (Ubuntu 16.04) - $VMNAME-ubuntu1604" { create_test_vm ubuntu1604 } From f0929de266648fb1430649d6adda2bef42fd2ca1 Mon Sep 17 00:00:00 2001 From: ronzle Date: Sat, 30 Apr 2022 14:12:45 +0200 Subject: [PATCH 2/3] Added Rocky 8.5 (#74) * Added Rocky 8.5 * changed distro wildcards Co-authored-by: Ronny Laborius --- kvm-install-vm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/kvm-install-vm b/kvm-install-vm index 0f7db8c..983c00d 100755 --- a/kvm-install-vm +++ b/kvm-install-vm @@ -88,7 +88,8 @@ function usage_subcommand () printf " ubuntu1604 Ubuntu 16.04 LTS (Xenial Xerus) ubuntu\n" printf " ubuntu1804 Ubuntu 18.04 LTS (Bionic Beaver) ubuntu\n" printf " ubuntu2004 Ubuntu 20.04 LTS (Focal Fossa) ubuntu\n" - printf "\n" + printf " rocky8.5 Rocky Linux rocky\n" + printf "\n" printf "EXAMPLES\n" printf " $prog create foo\n" printf " Create VM with the default parameters: CentOS 8, 1 vCPU, 1GB RAM, 10GB\n" @@ -446,6 +447,14 @@ function fetch_images () DISK_FORMAT=qcow2 LOGIN_USER=opensuse ;; + rocky85) + QCOW=Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2 + OS_TYPE="linux" + OS_VARIANT="rocky8.5" + IMAGE_URL=https://dl.rockylinux.org/pub/rocky/8.5/images + DISK_FORMAT=qcow2 + LOGIN_USER=rocky + ;; *) die "${DISTRO} not a supported OS. Run 'kvm-install-vm create help'." ;; @@ -526,7 +535,7 @@ function storpool_exists () function set_sudo_group () { case "${DISTRO}" in - centos?|fedora??|*-atomic|amazon?|opensuse* ) + centos*|fedora*|rocky*|*-atomic|amazon*|opensuse* ) SUDOGROUP="wheel" ;; ubuntu*|debian* ) @@ -544,7 +553,7 @@ function set_cloud_init_remove () centos6 ) CLOUDINITDISABLE="chkconfig cloud-init off" ;; - centos8|centos7|amazon?|fedora??|ubuntu*|debian*|opensuse* ) + centos8|centos7|amazon*|fedora*|rocky*|ubuntu*|debian*|opensuse* ) CLOUDINITDISABLE="systemctl disable cloud-init.service" ;; *-atomic) From 5a98915a772ca78cf76bc9f99579702494ec4a95 Mon Sep 17 00:00:00 2001 From: atomicbeecz Date: Sun, 29 Jan 2023 00:28:17 +0100 Subject: [PATCH 3/3] add ubuntu2204 (#76) Co-authored-by: bzz --- kvm-install-vm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/kvm-install-vm b/kvm-install-vm index 983c00d..2504b89 100755 --- a/kvm-install-vm +++ b/kvm-install-vm @@ -88,6 +88,7 @@ function usage_subcommand () printf " ubuntu1604 Ubuntu 16.04 LTS (Xenial Xerus) ubuntu\n" printf " ubuntu1804 Ubuntu 18.04 LTS (Bionic Beaver) ubuntu\n" printf " ubuntu2004 Ubuntu 20.04 LTS (Focal Fossa) ubuntu\n" + printf " ubuntu2204 Ubuntu 22.04 LTS (Jammy Jellyfish) ubuntu\n" printf " rocky8.5 Rocky Linux rocky\n" printf "\n" printf "EXAMPLES\n" @@ -439,6 +440,14 @@ function fetch_images () DISK_FORMAT=qcow2 LOGIN_USER=ubuntu ;; + ubuntu2204) + QCOW=ubuntu-22.04-server-cloudimg-amd64.img + OS_TYPE="linux" + OS_VARIANT="ubuntu22.04" + IMAGE_URL=https://cloud-images.ubuntu.com/releases/22.04/release + DISK_FORMAT=qcow2 + LOGIN_USER=ubuntu + ;; opensuse15) QCOW=openSUSE-Leap-15.2-OpenStack.x86_64.qcow2 OS_TYPE="linux"