Merge "Composable roles within services - Redis"

[apex-tripleo-heat-templates.git] / puppet / manifests / overcloud_compute.pp

diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
index 6ff74e1..6a6f54e 100644 (file)
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -70,7 +70,7 @@ if hiera('step') >= 4 {
     include ::ceph::profile::client
 
     $client_keys = hiera('ceph::profile::params::client_keys')
-    $client_user = join(['client.', hiera('ceph_client_user_name')])
+    $client_user = join(['client.', hiera('tripleo::profile::base::cinder::volume::rbd::cinder_rbd_user_name')])
     class { '::nova::compute::rbd':
       libvirt_rbd_secret_key => $client_keys[$client_user]['secret'],
     }
@@ -108,13 +108,6 @@ if hiera('step') >= 4 {
   nova_config {
     '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' {
@@ -204,10 +197,6 @@ if hiera('step') >= 4 {
     }
   }
 
-  neutron_config {
-    'DEFAULT/host': value => $fqdn;
-  }
-
   include ::ceilometer
   include ::ceilometer::config
   include ::ceilometer::agent::compute