Merge "Make focal the Ubuntu default for diskimage-create"
This commit is contained in:
commit
7f686e56b3
@ -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)
|
||||
|
@ -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
|
||||
|
@ -0,0 +1,4 @@
|
||||
---
|
||||
other:
|
||||
- |
|
||||
The diskimage-create.sh default for Ubuntu is now focal.
|
Loading…
Reference in New Issue
Block a user