compute: use new param for live_migration_tunnelled

Use the new interface in puppet-nova to configure this parameter.

Depends-On: I3498076b292e9dff88b9ad9d5c65c99a2a98cd7f
Change-Id: Id9f253e942f6373f77acc9239d79f62103b39904

diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index ee00a89..da3df8b 100644 (file)
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@ -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}

diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
index 6ff74e1..cf20c0c 100644 (file)
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -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' {