openstack/devstack
Code Issues Proposed changes

Merge "Add support for arm64 images"

Browse Source
This commit is contained in:
Jenkins 2015-04-16 18:29:50 +00:00 committed by Gerrit Code Review
commit 5d552e44c9
2 changed files with 10 additions and 0 deletions

4
functions

@ -287,6 +287,10 @@ function upload_image {
img_property="--property hw_cdrom_bus=scsi"
fi
if is_arch "aarch64"; then
img_property="--property hw_machine_type=virt --property hw_cdrom_bus=virtio --property os_command_line='console=ttyAMA0'"
fi
if [ "$container_format" = "bare" ]; then
if [ "$unpack" = "zcat" ]; then
openstack --os-token $token --os-url $GLANCE_SERVICE_PROTOCOL://$GLANCE_HOSTPORT image create "$image_name" $img_property --public --container-format=$container_format --disk-format $disk_format < <(zcat --force "${image}")

6
lib/nova_plugins/hypervisor-libvirt

@ -54,6 +54,12 @@ function configure_nova_hypervisor {
iniset $NOVA_CONF DEFAULT vnc_enabled "false"
fi
# arm64-specific configuration
if is_arch "aarch64"; then
# arm64 architecture currently does not support graphical consoles.
iniset $NOVA_CONF DEFAULT vnc_enabled "false"
fi
ENABLE_FILE_INJECTION=$(trueorfalse False ENABLE_FILE_INJECTION)
if [[ "$ENABLE_FILE_INJECTION" = "True" ]] ; then
# When libguestfs is available for file injection, enable using