openstack/octavia
Code Issues Proposed changes

Switch the default Ubuntu kernel to -virtual

Browse Source 
A previous patch changed the default Ubuntu kernel for the amphora
images to the -kvm kernel[1]. This kernel is missing a module required
for cryptsetup.
This patch switches the default to the -virtual kernel, which is
slightly larger than the -kvm kernel, but includes the required
kernel module for cryptsetup.

[1] https://review.opendev.org/665861

Change-Id: Ia05d7e9f8ac2692e5769648255ef0e4e10a18c03
This commit is contained in:
Michael Johnson 2019-07-08 10:28:01 -07:00
parent 31428bf25a
commit e3aacb67ad
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diskimage-create/README.rst
View File

@ -128,7 +128,7 @@ Command syntax:
'-f' disable tmpfs for build '-f' disable tmpfs for build
'-h' display help message '-h' display help message
'-i' is the base OS (default: ubuntu-minimal) '-i' is the base OS (default: ubuntu-minimal)
'-k' is the kernel meta package name, currently only for ubuntu-minimal base OS (default: linux-image-kvm) '-k' is the kernel meta package name, currently only for ubuntu-minimal base OS (default: linux-image-virtual)
'-l' is output logfile (default: none) '-l' is output logfile (default: none)
'-n' disable sshd (default: enabled) '-n' disable sshd (default: enabled)
'-o' is the output image file name '-o' is the output image file name

4
diskimage-create/diskimage-create.sh
View File

@ -48,7 +48,7 @@ usage() {
echo " '-f' disable tmpfs for build" echo " '-f' disable tmpfs for build"
echo " '-h' display this help message" echo " '-h' display this help message"
echo " '-i' is the base OS (default: ubuntu-minimal)" echo " '-i' is the base OS (default: ubuntu-minimal)"
echo " '-k' is the kernel meta package name, currently only for ubuntu-minimal base OS (default: linux-image-kvm)" echo " '-k' is the kernel meta package name, currently only for ubuntu-minimal base OS (default: linux-image-virtual)"
echo " '-l' is output logfile (default: none)" echo " '-l' is output logfile (default: none)"
echo " '-n' disable sshd (default: enabled)" echo " '-n' disable sshd (default: enabled)"
echo " '-o' is the output image file name" echo " '-o' is the output image file name"
@ -221,7 +221,7 @@ AMP_IMAGETYPE=${AMP_IMAGETYPE:-"qcow2"}
AMP_IMAGESIZE=${AMP_IMAGESIZE:-2} AMP_IMAGESIZE=${AMP_IMAGESIZE:-2}
if [ "$AMP_BASEOS" = "ubuntu-minimal" ]; then if [ "$AMP_BASEOS" = "ubuntu-minimal" ]; then
export DIB_UBUNTU_KERNEL=${AMP_KERNEL:-"linux-image-kvm"} export DIB_UBUNTU_KERNEL=${AMP_KERNEL:-"linux-image-virtual"}
fi fi
AMP_DISABLE_SSHD=${AMP_DISABLE_SSHD:-0} AMP_DISABLE_SSHD=${AMP_DISABLE_SSHD:-0}

7
releasenotes/notes/Use-Ubuntu-KVM-kernel-for-Amphora-a1e8af8bc7893011.yaml
View File

@ -1,7 +0,0 @@
---
features:
- |
The default kernel for the amphora image has switched from
linux-image-generic to linux-image-kvm, resulting in an image size
reduction of about 200MB. The linux-image-kvm kernel works with kvm,
qemu tcg, and Xen hypervisors among others.

7
releasenotes/notes/Use-Ubuntu-virtual-kernel-for-Amphora-a1e8af8bc7893011.yaml Normal file
View File

@ -0,0 +1,7 @@
---
features:
- |
The default kernel for the amphora image has switched from
linux-image-generic to linux-image-virtual, resulting in an image size
reduction of about 150MB. The linux-image-virtual kernel works with kvm,
qemu tcg, and Xen hypervisors among others.