Revert "Manage keystone initialization directly in t-h-t manifests"

This reverts commit 86d6c1ddc76bad423194e789ffb5474e4e12960e.

This likely has an impact on upgrades, and since we don't
have an upgrade CI job yet I'm concerned that we may have
just broken ourselves.  I would prefer to wait to merge this
until the CI job is in place.

Change-Id: Ib2366cb4b40471a28122f6e9955da9bdb31a53fb

2 files changed, 0 insertions, 30 deletions

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 96302f2e..813309e4 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -484,15 +484,6 @@ if hiera('step') >= 3 {
 
 if hiera('step') >= 4 {
   include ::keystone::cron::token_flush
-
-  include ::ceilometer::keystone::auth
-  include ::cinder::keystone::auth
-  include ::glance::keystone::auth
-  include ::heat::keystone::auth
-  include ::neutron::keystone::auth
-  include ::nova::keystone::auth
-  include ::swift::keystone::auth
-
 } #END STEP 4
 
 $package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_controller', hiera('step')])
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 462530e9..71811563 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -1557,27 +1557,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],
     }
 
   }