openstack/devstack
Code Issues Proposed changes

Merge "Move setting lvm libvirt configs to hypervisor-libvirt"

Browse Source
This commit is contained in:
Jenkins
2016-05-20 12:50:04 +00:00
committed by Gerrit Code Review
parent 52f6adf512 9278eb78df
commit f10bb119cc
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/nova
View File

@@ -589,14 +589,6 @@ function create_nova_conf {
iniset $NOVA_CONF cinder os_region_name "$REGION_NAME"
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
iniset $NOVA_CONF DEFAULT glance_protocol https
fi

6
lib/nova_plugins/hypervisor-libvirt
View File

@@ -68,6 +68,12 @@ function configure_nova_hypervisor {
iniset $NOVA_CONF vnc vncserver_proxyclient_address $HOST_IP
iniset $NOVA_CONF vnc vncserver_listen $HOST_IP
iniset $NOVA_CONF vnc keymap
elif [[ "$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
}