openstack/tripleo-heat-templates
Code Issues Proposed changes

compute: use live_migration_tunnelled

Browse Source 
In a previous patch [1], we added support for VIR_MIGRATE_TUNNELLED when
doing VM shared storage.

In Nova Mitaka [2] [3], we have now a parameter called
'live_migration_tunnelled' to whether or not use tunnelled migration.
It replaces 'block_migration_flag' and 'live_migration_flag' that are
both deprecated.

[1] https://review.openstack.org/#/c/286584/
[2] https://review.openstack.org/#/c/263436/
[3] https://review.openstack.org/#/c/263434/

Change-Id: I8b199b6e72c80b2df7b679e0a20e39f8400d0478
This commit is contained in:
Emilien Macchi 2016-03-14 12:21:18 -04:00
parent 0b5459c178
commit 071711bd6d
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
puppet/manifests/overcloud_compute.pp
View File

@ -94,31 +94,16 @@ class { '::nova::compute::libvirt' :
vncserver_listen => $vncserver_listen,
}
# 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
if $rbd_ephemeral_storage {
$block_migration_flag = 'VIR_MIGRATE_UNDEFINE_SOURCE, VIR_MIGRATE_PEER2PEER, VIR_MIGRATE_LIVE, VIR_MIGRATE_TUNNELLED, VIR_MIGRATE_NON_SHARED_INC'
$live_migration_flag = 'VIR_MIGRATE_UNDEFINE_SOURCE, VIR_MIGRATE_PEER2PEER, VIR_MIGRATE_LIVE, VIR_MIGRATE_TUNNELLED'
} else {
$block_migration_flag = 'VIR_MIGRATE_UNDEFINE_SOURCE, VIR_MIGRATE_PEER2PEER, VIR_MIGRATE_LIVE, VIR_MIGRATE_NON_SHARED_INC'
$live_migration_flag = 'VIR_MIGRATE_UNDEFINE_SOURCE, VIR_MIGRATE_PEER2PEER, VIR_MIGRATE_LIVE'
}
nova_config {
'DEFAULT/my_ip': value => $ipaddress;
'DEFAULT/linuxnet_interface_driver': value => 'nova.network.linux_net.LinuxOVSInterfaceDriver';
'DEFAULT/host': value => $fqdn;
# In future versions of Nova, the live/block migration flags will be deprecated [1].
# Tunnelling (encryption) will be handled via a single _new_ Nova
# config attribute 'live_migration_tunnelled'[2], thus
# avoiding users to have to supply libvirt flags.
# 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.
# [1] https://review.openstack.org/#/c/263436/
# [2] https://review.openstack.org/#/c/263434/
'libvirt/block_migration_flag': value => $block_migration_flag;
'libvirt/live_migration_flag': value => $live_migration_flag;
'libvirt/live_migration_tunnelled': value => $rbd_ephemeral_storage;
}
if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' {