openstack/devstack
Code Issues Proposed changes

Merge "nova: remove explicit file injection being disabled"

Browse Source
This commit is contained in:
Jenkins 2016-08-09 10:39:39 +00:00 committed by Gerrit Code Review
commit be0f207007
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_user ${CINDER_CEPH_USER}
iniset $NOVA_CONF libvirt rbd_secret_uuid ${CINDER_CEPH_UUID} iniset $NOVA_CONF libvirt rbd_secret_uuid ${CINDER_CEPH_UUID}
iniset $NOVA_CONF libvirt inject_key false 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 disk_cachemodes "network=writeback"
iniset $NOVA_CONF libvirt images_type rbd iniset $NOVA_CONF libvirt images_type rbd
iniset $NOVA_CONF libvirt images_rbd_pool ${NOVA_CEPH_POOL} iniset $NOVA_CONF libvirt images_rbd_pool ${NOVA_CEPH_POOL}

4
lib/nova_plugins/hypervisor-libvirt
View File

@ -58,10 +58,6 @@ function configure_nova_hypervisor {
iniset $NOVA_CONF libvirt cpu_mode "host-passthrough" iniset $NOVA_CONF libvirt cpu_mode "host-passthrough"
fi 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 if [[ "$LIBVIRT_TYPE" = "parallels" ]]; then
iniset $NOVA_CONF libvirt connection_uri "parallels+unix:///system" iniset $NOVA_CONF libvirt connection_uri "parallels+unix:///system"
iniset $NOVA_CONF libvirt images_type "ploop" iniset $NOVA_CONF libvirt images_type "ploop"