Browse code

Merge "libvirt plugin "parallels" support"

Jenkins authored on 2014/12/08 03:17:46
Showing 2 changed files
... ...
@@ -129,6 +129,9 @@ function configure_glance {
129 129
         iniset $GLANCE_API_CONF DEFAULT container_formats "ami,ari,aki,bare,ovf,tgz"
130 130
         iniset $GLANCE_API_CONF DEFAULT disk_formats "ami,ari,aki,vhd,raw,iso"
131 131
     fi
132
+    if [ "$VIRT_DRIVER" = 'libvirt' ] && [ "$LIBVIRT_TYPE" = 'parallels' ]; then
133
+        iniset $GLANCE_API_CONF DEFAULT disk_formats "ami,ari,aki,vhd,vmdk,raw,qcow2,vdi,iso,ploop"
134
+    fi
132 135
 
133 136
     # Store specific configs
134 137
     iniset $GLANCE_API_CONF DEFAULT filesystem_store_datadir $GLANCE_IMAGE_DIR/
... ...
@@ -64,6 +64,11 @@ function configure_nova_hypervisor {
64 64
         # disable it here for now to avoid surprises later.
65 65
         iniset $NOVA_CONF libvirt inject_partition '-2'
66 66
     fi
67
+
68
+    if [[ "$LIBVIRT_TYPE" = "parallels" ]]; then
69
+        iniset $NOVA_CONF libvirt connection_uri "parallels+unix:///system"
70
+        iniset $NOVA_CONF libvirt images_type "ploop"
71
+    fi
67 72
 }
68 73
 
69 74
 # install_nova_hypervisor() - Install external components