Merge "Change default bond-mode"

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

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index adb5218..3edd7de 100644 (file)
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -692,7 +692,7 @@ if hiera('step') >= 3 {
     $ceph_pools = hiera('ceph_pools')
     ceph::pool { $ceph_pools : }
 
-    $cinder_pool_requires = [Ceph::Pool['volumes']]
+    $cinder_pool_requires = [Ceph::Pool[hiera('cinder_rbd_pool_name')]]
 
   } else {
     $cinder_pool_requires = []
@@ -702,8 +702,8 @@ if hiera('step') >= 3 {
     $cinder_rbd_backend = 'tripleo_ceph'
 
     cinder::backend::rbd { $cinder_rbd_backend :
-      rbd_pool        => 'volumes',
-      rbd_user        => 'openstack',
+      rbd_pool        => hiera('cinder_rbd_pool_name'),
+      rbd_user        => hiera('ceph_client_user_name'),
       rbd_secret_uuid => hiera('ceph::profile::params::fsid'),
       require         => $cinder_pool_requires,
     }
@@ -1565,27 +1565,6 @@ if hiera('step') >= 5 {
     } ->
     class {'::keystone::endpoint' :
       require => Pacemaker::Resource::Service[$::keystone::params::service_name],
-    } ->
-    class { '::ceilometer::keystone::auth' :
-      require => Pacemaker::Resource::Service[$::keystone::params::service_name],
-    } ->
-    class { '::cinder::keystone::auth' :
-      require => Pacemaker::Resource::Service[$::keystone::params::service_name],
-    } ->
-    class { '::glance::keystone::auth' :
-      require => Pacemaker::Resource::Service[$::keystone::params::service_name],
-    } ->
-    class { '::heat::keystone::auth' :
-      require => Pacemaker::Resource::Service[$::keystone::params::service_name],
-    } ->
-    class { '::neutron::keystone::auth' :
-      require => Pacemaker::Resource::Service[$::keystone::params::service_name],
-    } ->
-    class { '::nova::keystone::auth' :
-      require => Pacemaker::Resource::Service[$::keystone::params::service_name],
-    } ->
-    class { '::swift::keystone::auth' :
-      require => Pacemaker::Resource::Service[$::keystone::params::service_name],
     }
 
   }