commit 78ab80e5589a7df21a03f06f38c4bae3e79bf756
author Jenkins <jenkins@review.openstack.org> Sun Feb 02 03:04:40 2014 +0000
committer Gerrit Code Review <review@openstack.org> Sun Feb 02 03:04:40 2014 +0000
tree eb9faa6de4025c42609e03cb67770c19a98555ff
parent c4a430bc93d6b9e86f0d2156413a1a6720f0a274
parent 6bf1f1fb332c93cb4b74cf6b6511d2f9818a501d

Merge "use ext4 for guest default ephemeral"

lib/nova_plugins/hypervisor-libvirt

diff --git a/lib/nova_plugins/hypervisor-libvirt b/lib/nova_plugins/hypervisor-libvirt
index 6f90f4a..42d3af1 100644
--- a/lib/nova_plugins/hypervisor-libvirt
+++ b/lib/nova_plugins/hypervisor-libvirt
@@ -108,6 +108,7 @@
     iniset $NOVA_CONF DEFAULT libvirt_type "$LIBVIRT_TYPE"
     iniset $NOVA_CONF DEFAULT libvirt_cpu_mode "none"
     iniset $NOVA_CONF DEFAULT use_usb_tablet "False"
+    iniset $NOVA_CONF DEFAULT default_ephemeral_format "ext4"
     iniset $NOVA_CONF DEFAULT compute_driver "libvirt.LibvirtDriver"
     LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.libvirt.firewall.IptablesFirewallDriver"}
     iniset $NOVA_CONF DEFAULT firewall_driver "$LIBVIRT_FIREWALL_DRIVER"