Merge "Update default image versions for CentOS and RHEL"

diskimage-create/README.rst

@@ -69,8 +69,9 @@ running the tests:
 
 Usage
 =====
-This script and associated elements will build Amphora images.  Current support
-is with an Ubuntu base OS and HAProxy.  The script can use Fedora
+This script and associated elements will build Amphora images. Current support
+is with an Ubuntu and CentOS Stream base OS and HAProxy.
+The script can use RHEL and Fedora
 as a base OS but these will not initially be tested or supported.
 As the project progresses and/or the diskimage-builder project adds support
 for additional base OS options they may become available for Amphora images.
@@ -101,7 +102,7 @@ Command syntax:
             [-a i386 | **amd64** | armhf | aarch64 | ppc64le ]
             [-b **haproxy** ]
             [-c **~/.cache/image-create** | <cache directory> ]
-            [-d **focal**/**8** | <other release id> ]
+            [-d **focal**/**9-stream**/**9** | <other release id> ]
             [-e]
             [-f]
             [-g **repository branch** | stable/train | stable/stein | ... ]

diskimage-create/diskimage-create.sh

@@ -23,7 +23,7 @@ usage() {
     echo "            [-a i386 | **amd64** | armhf | aarch64 | ppc64le]"
     echo "            [-b **haproxy** ]"
     echo "            [-c **~/.cache/image-create** | <cache directory> ]"
-    echo "            [-d **focal**/**8** | <other release id> ]"
+    echo "            [-d **focal**/**9-stream**/**9** | <other release id> ]"
     echo "            [-e]"
     echo "            [-f]"
     echo "            [-g **repository branch** | stable/train | stable/stein | ... ]"
@@ -235,8 +235,10 @@ AMP_BASEOS=${AMP_BASEOS:-"ubuntu-minimal"}
 
 if [ "$AMP_BASEOS" = "ubuntu-minimal" ]; then
     export DIB_RELEASE=${AMP_DIB_RELEASE:-"focal"}
-elif [ "${AMP_BASEOS}" = "centos-minimal" ] || [ "${AMP_BASEOS}" = "rhel" ]; then
-    export DIB_RELEASE=${AMP_DIB_RELEASE:-"8"}
+elif [ "${AMP_BASEOS}" = "rhel" ]; then
+    export DIB_RELEASE=${AMP_DIB_RELEASE:-"9"}
+elif [ "${AMP_BASEOS}" = "centos-minimal" ]; then
+    export DIB_RELEASE=${AMP_DIB_RELEASE:-"9-stream"}
 elif [ "${AMP_BASEOS}" = "fedora" ]; then
     export DIB_RELEASE=${AMP_DIB_RELEASE:-"28"}
 fi

releasenotes/notes/update-diskimage-create-rhel-centos-defaults-2be19c634f10506f.yaml

@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    diskimage-create defaults now to distribution release 9 when selecting RHEL
+    as base OS and to release 9-stream when selecting CentOS as base OS.