openstack/devstack
Code Issues Proposed changes

Merge "libvirt plugin "parallels" support"

Browse Source
This commit is contained in:
Jenkins 2014-12-07 18:17:46 +00:00 committed by Gerrit Code Review
commit 7adfe91ca6
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/glance
View File

@ -129,6 +129,9 @@ function configure_glance {
iniset $GLANCE_API_CONF DEFAULT container_formats "ami,ari,aki,bare,ovf,tgz" iniset $GLANCE_API_CONF DEFAULT container_formats "ami,ari,aki,bare,ovf,tgz"
iniset $GLANCE_API_CONF DEFAULT disk_formats "ami,ari,aki,vhd,raw,iso" iniset $GLANCE_API_CONF DEFAULT disk_formats "ami,ari,aki,vhd,raw,iso"
fi fi
if [ "$VIRT_DRIVER" = 'libvirt' ] && [ "$LIBVIRT_TYPE" = 'parallels' ]; then
iniset $GLANCE_API_CONF DEFAULT disk_formats "ami,ari,aki,vhd,vmdk,raw,qcow2,vdi,iso,ploop"
fi
# Store specific configs # Store specific configs
iniset $GLANCE_API_CONF DEFAULT filesystem_store_datadir $GLANCE_IMAGE_DIR/ iniset $GLANCE_API_CONF DEFAULT filesystem_store_datadir $GLANCE_IMAGE_DIR/

5
lib/nova_plugins/hypervisor-libvirt
View File

@ -64,6 +64,11 @@ function configure_nova_hypervisor {
# disable it here for now to avoid surprises later. # disable it here for now to avoid surprises later.
iniset $NOVA_CONF libvirt inject_partition '-2' iniset $NOVA_CONF libvirt inject_partition '-2'
fi fi
if [[ "$LIBVIRT_TYPE" = "parallels" ]]; then
iniset $NOVA_CONF libvirt connection_uri "parallels+unix:///system"
iniset $NOVA_CONF libvirt images_type "ploop"
fi
} }
# install_nova_hypervisor() - Install external components # install_nova_hypervisor() - Install external components