Skip to content

Commit 9079a40

Browse files
author
Matt Riedemann
committed
nova: remove explicit file injection being disabled
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
1 parent 6874734 commit 9079a40

2 files changed

Lines changed: 0 additions & 5 deletions

File tree

lib/ceph

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,6 @@ function configure_ceph_nova {
301301
iniset $NOVA_CONF libvirt rbd_user ${CINDER_CEPH_USER}
302302
iniset $NOVA_CONF libvirt rbd_secret_uuid ${CINDER_CEPH_UUID}
303303
iniset $NOVA_CONF libvirt inject_key false
304-
iniset $NOVA_CONF libvirt inject_partition -2
305304
iniset $NOVA_CONF libvirt disk_cachemodes "network=writeback"
306305
iniset $NOVA_CONF libvirt images_type rbd
307306
iniset $NOVA_CONF libvirt images_rbd_pool ${NOVA_CEPH_POOL}

lib/nova_plugins/hypervisor-libvirt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@ function configure_nova_hypervisor {
5757
iniset $NOVA_CONF vnc enabled "false"
5858
fi
5959

60-
# File injection is being disabled by default in the near future -
61-
# disable it here for now to avoid surprises later.
62-
iniset $NOVA_CONF libvirt inject_partition '-2'
63-
6460
if [[ "$LIBVIRT_TYPE" = "parallels" ]]; then
6561
iniset $NOVA_CONF libvirt connection_uri "parallels+unix:///system"
6662
iniset $NOVA_CONF libvirt images_type "ploop"

0 commit comments

Comments
 (0)