Merge "libvirt plugin "parallels" support"
diff --git a/lib/glance b/lib/glance
index b4c18f8..0970f94 100644
--- a/lib/glance
+++ b/lib/glance
@@ -129,6 +129,9 @@
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"
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
iniset $GLANCE_API_CONF DEFAULT filesystem_store_datadir $GLANCE_IMAGE_DIR/
diff --git a/lib/nova_plugins/hypervisor-libvirt b/lib/nova_plugins/hypervisor-libvirt
index 53dbfb9..123ca82 100644
--- a/lib/nova_plugins/hypervisor-libvirt
+++ b/lib/nova_plugins/hypervisor-libvirt
@@ -64,6 +64,11 @@
# disable it here for now to avoid surprises later.
iniset $NOVA_CONF libvirt inject_partition '-2'
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