Browse code

Merge "nova: remove explicit file injection being disabled"

Jenkins authored on 2016/08/09 19:39:39
Showing 2 changed files
... ...
@@ -301,7 +301,6 @@ function configure_ceph_nova {
301 301
     iniset $NOVA_CONF libvirt rbd_user ${CINDER_CEPH_USER}
302 302
     iniset $NOVA_CONF libvirt rbd_secret_uuid ${CINDER_CEPH_UUID}
303 303
     iniset $NOVA_CONF libvirt inject_key false
304
-    iniset $NOVA_CONF libvirt inject_partition -2
305 304
     iniset $NOVA_CONF libvirt disk_cachemodes "network=writeback"
306 305
     iniset $NOVA_CONF libvirt images_type rbd
307 306
     iniset $NOVA_CONF libvirt images_rbd_pool ${NOVA_CEPH_POOL}
... ...
@@ -58,10 +58,6 @@ function configure_nova_hypervisor {
58 58
         iniset $NOVA_CONF libvirt cpu_mode "host-passthrough"
59 59
     fi
60 60
 
61
-    # File injection is being disabled by default in the near future -
62
-    # disable it here for now to avoid surprises later.
63
-    iniset $NOVA_CONF libvirt inject_partition '-2'
64
-
65 61
     if [[ "$LIBVIRT_TYPE" = "parallels" ]]; then
66 62
         iniset $NOVA_CONF libvirt connection_uri "parallels+unix:///system"
67 63
         iniset $NOVA_CONF libvirt images_type "ploop"