Merge "Use LVM_VOLUME_CLEAR if set"

2016-05-17 02:47:46 +00:00
parent 7cd7f0576b ea76f319a2
commit 1612941ce4
1 changed files with 3 additions and 0 deletions
--- a/lib/nova
+++ b/lib/nova
@@ -592,6 +592,9 @@ function create_nova_conf {
    if [[ "$NOVA_BACKEND" == "LVM" ]]; then
        iniset $NOVA_CONF libvirt images_type "lvm"
        iniset $NOVA_CONF libvirt images_volume_group $DEFAULT_VOLUME_GROUP_NAME
+        if isset LVM_VOLUME_CLEAR; then
+            iniset $NOVA_CONF libvirt volume_clear "$LVM_VOLUME_CLEAR"
+        fi
    fi

    if is_ssl_enabled_service glance || is_service_enabled tls-proxy; then