openstack
/
devstack
Code Issues Proposed changes

Merge "Only set hw_rng_model by default if we're on libvirt"

This commit is contained in:
Zuul 2020-07-17 14:53:32 +00:00 committed by Gerrit Code Review
parent fa75c5dd8a 49ad4850c8
commit eee60c7671
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
functions
View File

@ -324,7 +324,16 @@ function upload_image {
local disk_format=""
local container_format=""
local unpack=""
local img_property="hw_rng_model=virtio"
local img_property=""
# NOTE(danms): If we're on libvirt/qemu or libvirt/kvm, set the hw_rng_model
# to libvirt in the image properties.
if [[ "$VIRT_DRIVER" == "libvirt" ]]; then
if [[ "$LIBVIRT_TYPE" == "qemu" || "$LIBVIRT_TYPE" == "kvm" ]]; then
img_property="hw_rng_model=virtio"
fi
fi
case "$image_fname" in
*.tar.gz|*.tgz)
# Extract ami and aki files