From 9079a40e9ebf6c20d754b8221a55b183de1a0766 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Sun, 3 Jul 2016 19:20:27 -0400 Subject: [PATCH] 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 --- lib/ceph | 1 - lib/nova_plugins/hypervisor-libvirt | 4 ---- 2 files changed, 5 deletions(-) diff --git a/lib/ceph b/lib/ceph index e999647ed8..2353de1758 100644 --- a/lib/ceph +++ b/lib/ceph @@ -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} diff --git a/lib/nova_plugins/hypervisor-libvirt b/lib/nova_plugins/hypervisor-libvirt index d0e364efc3..503d4b6c89 100644 --- a/lib/nova_plugins/hypervisor-libvirt +++ b/lib/nova_plugins/hypervisor-libvirt @@ -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"