From 8cd2097190a5b9de404ae73482556e35a598c85e Mon Sep 17 00:00:00 2001 From: Goutham Pacha Ravi Date: Tue, 10 May 2022 18:24:22 +0530 Subject: [PATCH] Switch ubuntu image to Jammy Jellyfish Move to the 22.04 LTS release. Also stop installing python2, since its EOL. Depends-On: Idd3e6a6fdb8cf13727cd674c76efd89b3aacfc52 Change-Id: I9b4c134ecc9279487e253fa3bc38ae32fe487ac6 Signed-off-by: Goutham Pacha Ravi --- bin/manila-image-create | 2 +- elements/manila-centos-minimal/package-installs.yaml | 2 +- elements/manila-ubuntu-minimal/package-installs.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/manila-image-create b/bin/manila-image-create index 39fe503..bda0f66 100755 --- a/bin/manila-image-create +++ b/bin/manila-image-create @@ -20,7 +20,7 @@ MANILA_USER_AUTHORIZED_KEYS=${MANILA_USER_AUTHORIZED_KEYS:-"None"} # Manila image settings MANILA_IMG_ARCH=${MANILA_IMG_ARCH:-"amd64"} MANILA_IMG_OS=${MANILA_IMG_OS:-"manila-ubuntu-minimal"} -MANILA_IMG_OS_VER=${MANILA_IMG_OS_VER:-"focal"} +MANILA_IMG_OS_VER=${MANILA_IMG_OS_VER:-"jammy"} MANILA_IMG_NAME=${MANILA_IMG_NAME:-"manila-service-image"} # Manila image creation default diff --git a/elements/manila-centos-minimal/package-installs.yaml b/elements/manila-centos-minimal/package-installs.yaml index f5dc0d8..9b3fad6 100755 --- a/elements/manila-centos-minimal/package-installs.yaml +++ b/elements/manila-centos-minimal/package-installs.yaml @@ -5,5 +5,5 @@ vim: iptables: iputils: net-tools: -python: +python3: qemu-guest-agent: diff --git a/elements/manila-ubuntu-minimal/package-installs.yaml b/elements/manila-ubuntu-minimal/package-installs.yaml index dd09e9e..e1971fb 100755 --- a/elements/manila-ubuntu-minimal/package-installs.yaml +++ b/elements/manila-ubuntu-minimal/package-installs.yaml @@ -5,5 +5,5 @@ vim: iptables: inetutils-ping: net-tools: -python: +python3: qemu-guest-agent: