Merge "compute: use new param for live_migration_tunnelled"
This commit is contained in:
commit
ccb46a51ac
|
@ -531,6 +531,12 @@ resources:
|
|||
nova_api_host: {get_input: nova_api_host}
|
||||
nova::compute::vncproxy_host: {get_input: nova_public_ip}
|
||||
nova::compute::rbd::ephemeral_storage: {get_input: nova_enable_rbd_backend}
|
||||
# TUNNELLED mode provides a security enhancement when using shared storage but is not
|
||||
# supported when not using shared storage.
|
||||
# See https://bugzilla.redhat.com/show_bug.cgi?id=1301986#c12
|
||||
# In future versions of QEMU (2.6, mostly), Dan's native encryption
|
||||
# work will obsolete the need to use TUNNELLED transport mode.
|
||||
nova::migration::live_migration_tunnelled: {get_input: nova_enable_rbd_backend}
|
||||
rbd_persistent_storage: {get_input: cinder_enable_rbd_backend}
|
||||
nova_password: {get_input: nova_password}
|
||||
nova::compute::network_device_mtu: {get_input: neutron_tenant_mtu}
|
||||
|
|
|
@ -109,12 +109,6 @@ if hiera('step') >= 4 {
|
|||
'DEFAULT/my_ip': value => $ipaddress;
|
||||
'DEFAULT/linuxnet_interface_driver': value => 'nova.network.linux_net.LinuxOVSInterfaceDriver';
|
||||
'DEFAULT/host': value => $fqdn;
|
||||
# TUNNELLED mode provides a security enhancement when using shared storage but is not
|
||||
# supported when not using shared storage.
|
||||
# See https://bugzilla.redhat.com/show_bug.cgi?id=1301986#c12
|
||||
# In future versions of QEMU (2.6, mostly), Dan's native encryption
|
||||
# work will obsolete the need to use TUNNELLED transport mode.
|
||||
'libvirt/live_migration_tunnelled': value => $rbd_ephemeral_storage;
|
||||
}
|
||||
|
||||
if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' {
|
||||
|
|
Loading…
Reference in New Issue