openstack/devstack
Code Issues Proposed changes

nova: remove explicit file injection being disabled

Browse Source 
Change 9ce99a44cf85e431227536e2251ef05b52e61524 disabled file
injection with the libvirt driver by default back in Icehouse,
so devstack doesn't need to do this explicitly anymore.

Change-Id: Id0c521f6f624367bd497463c8c2d99488548fcff
This commit is contained in:
Matt Riedemann 2016-07-03 19:20:27 -04:00
parent 6874734935
commit 9079a40e9e
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/ceph
View File

@ -301,7 +301,6 @@ function configure_ceph_nova {
iniset $NOVA_CONF libvirt rbd_user ${CINDER_CEPH_USER}
iniset $NOVA_CONF libvirt rbd_secret_uuid ${CINDER_CEPH_UUID}
iniset $NOVA_CONF libvirt inject_key false
iniset $NOVA_CONF libvirt inject_partition -2
iniset $NOVA_CONF libvirt disk_cachemodes "network=writeback"
iniset $NOVA_CONF libvirt images_type rbd
iniset $NOVA_CONF libvirt images_rbd_pool ${NOVA_CEPH_POOL}

4
lib/nova_plugins/hypervisor-libvirt
View File

@ -57,10 +57,6 @@ function configure_nova_hypervisor {
iniset $NOVA_CONF vnc enabled "false"
fi
# File injection is being disabled by default in the near future -
# disable it here for now to avoid surprises later.
iniset $NOVA_CONF libvirt inject_partition '-2'
if [[ "$LIBVIRT_TYPE" = "parallels" ]]; then
iniset $NOVA_CONF libvirt connection_uri "parallels+unix:///system"
iniset $NOVA_CONF libvirt images_type "ploop"