summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorEmilien Macchi <emilien@redhat.com>2016-05-30 15:15:54 -0400
committerEmilien Macchi <emilien@redhat.com>2016-05-30 15:19:25 -0400
commitd1c21c6cd100120b9fd68cde6776b3caa007bd62 (patch)
treedfabc21a7b74742fcf209a931c9c1be22f3b6782 /puppet
parent2b6c7dbefff4b1fcab36f3fbc105d63187c54ac5 (diff)
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
Diffstat (limited to 'puppet')
-rw-r--r--puppet/compute.yaml6
-rw-r--r--puppet/manifests/overcloud_compute.pp6
2 files changed, 6 insertions, 6 deletions
diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index ee00a890..da3df8b7 100644
--- 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 6ff74e12..cf20c0ca 100644
--- 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' {