Browse code
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
Matt Riedemann authored on 2016/07/04 08:20:27Showing 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}
|
| ... | ... |
@@ -57,10 +57,6 @@ function configure_nova_hypervisor {
|
| 57 | 57 |
iniset $NOVA_CONF vnc enabled "false" |
| 58 | 58 |
fi |
| 59 | 59 |
|
| 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 |
- |
|
| 64 | 60 |
if [[ "$LIBVIRT_TYPE" = "parallels" ]]; then |
| 65 | 61 |
iniset $NOVA_CONF libvirt connection_uri "parallels+unix:///system" |
| 66 | 62 |
iniset $NOVA_CONF libvirt images_type "ploop" |