openstack/devstack
Code Issues Proposed changes

Move setting lvm libvirt configs to hypervisor-libvirt

Browse Source 
When the nova backend is LVM we set some libvirt configs
in nova.conf. Those should happen in the libvirt plugin
file rather than the generic nova file since it's specific
to running nova-compute with libvirt.

Change-Id: I37a63a5fba2e9eea4daafe4ec390b2e7aac236f3
This commit is contained in:
Matt Riedemann 2016-05-18 13:38:38 -04:00
parent 4894ac0d29
commit 9278eb78df
2 changed files with 6 additions and 8 deletions
Show Stats 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" 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 if is_ssl_enabled_service glance || is_service_enabled tls-proxy; then
iniset $NOVA_CONF DEFAULT glance_protocol https iniset $NOVA_CONF DEFAULT glance_protocol https
fi 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_proxyclient_address $HOST_IP
iniset $NOVA_CONF vnc vncserver_listen $HOST_IP iniset $NOVA_CONF vnc vncserver_listen $HOST_IP
iniset $NOVA_CONF vnc keymap 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 fi
} }