From 40d011ab7f1f7141041440b760a8e68671979016 Mon Sep 17 00:00:00 2001
From: Michael Johnson <johnsomor@gmail.com>
Date: Mon, 16 Nov 2020 13:35:41 -0800
Subject: [PATCH] Make focal the Ubuntu default for diskimage-create

The current PTI version for Ubuntu is focal. This patch updates
the diskimage-create.sh default to focal from bionic.

Change-Id: Ia380b712d9d40d702b99bb3b04e1f45dcb60b96c
---
 diskimage-create/README.rst                                 | 4 ++--
 diskimage-create/diskimage-create.sh                        | 6 +++---
 .../notes/default-ubuntu-focal-6c4a94b8cfcfd995.yaml        | 4 ++++
 3 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 releasenotes/notes/default-ubuntu-focal-6c4a94b8cfcfd995.yaml

diff --git a/diskimage-create/README.rst b/diskimage-create/README.rst
index 9a5085f5d4..b6f0d16680 100644
--- a/diskimage-create/README.rst
+++ b/diskimage-create/README.rst
@@ -101,7 +101,7 @@ Command syntax:
             [-a i386 | **amd64** | armhf | aarch64 | ppc64le ]
             [-b **haproxy** ]
             [-c **~/.cache/image-create** | <cache directory> ]
-            [-d **bionic**/**8** | <other release id> ]
+            [-d **focal**/**8** | <other release id> ]
             [-e]
             [-f]
             [-g **repository branch** | stable/train | stable/stein | ... ]
@@ -122,7 +122,7 @@ Command syntax:
         '-a' is the architecture type for the image (default: amd64)
         '-b' is the backend type (default: haproxy)
         '-c' is the path to the cache directory (default: ~/.cache/image-create)
-        '-d' distribution release id (default on ubuntu: bionic)
+        '-d' distribution release id (default on ubuntu: focal)
         '-e' enable complete mandatory access control systems when available (default: permissive)
         '-f' disable tmpfs for build
         '-g' build the image for a specific OpenStack Git branch (default: current repository branch)
diff --git a/diskimage-create/diskimage-create.sh b/diskimage-create/diskimage-create.sh
index 72a04801a4..54a2a9a07a 100755
--- a/diskimage-create/diskimage-create.sh
+++ b/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 **bionic**/**8** | <other release id> ]"
+    echo "            [-d **focal**/**8** | <other release id> ]"
     echo "            [-e]"
     echo "            [-f]"
     echo "            [-g **repository branch** | stable/train | stable/stein | ... ]"
@@ -44,7 +44,7 @@ usage() {
     echo "        '-a' is the architecture type for the image (default: amd64)"
     echo "        '-b' is the backend type (default: haproxy)"
     echo "        '-c' is the path to the cache directory (default: ~/.cache/image-create)"
-    echo "        '-d' distribution release id (default on ubuntu: bionic)"
+    echo "        '-d' distribution release id (default on ubuntu: focal)"
     echo "        '-e' enable complete mandatory access control systems when available (default: permissive)"
     echo "        '-f' disable tmpfs for build"
     echo "        '-g' build the image for a specific OpenStack Git branch (default: current repository branch)"
@@ -231,7 +231,7 @@ AMP_CACHEDIR="$( cd "$AMP_CACHEDIR" && pwd )"
 AMP_BASEOS=${AMP_BASEOS:-"ubuntu-minimal"}
 
 if [ "$AMP_BASEOS" = "ubuntu-minimal" ]; then
-    export DIB_RELEASE=${AMP_DIB_RELEASE:-"bionic"}
+    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}" = "fedora" ]; then
diff --git a/releasenotes/notes/default-ubuntu-focal-6c4a94b8cfcfd995.yaml b/releasenotes/notes/default-ubuntu-focal-6c4a94b8cfcfd995.yaml
new file mode 100644
index 0000000000..fd58f12bc4
--- /dev/null
+++ b/releasenotes/notes/default-ubuntu-focal-6c4a94b8cfcfd995.yaml
@@ -0,0 +1,4 @@
+---
+other:
+  - |
+    The diskimage-create.sh default for Ubuntu is now focal.