Manage keystone initialization directly in t-h-t manifests

This is the second change of a servies of two, it creates the
user, user_role, service and endpoint for:

  * glance
  * nova
  * neutron
  * cinder
  * horizon
  * swift
  * ceilometer
  * heat

Change-Id: I50e792d98a2ba516ff498c58ad402f463c5f7e76

2 files changed, 30 insertions, 0 deletions

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 813309e4..96302f2e 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -484,6 +484,15 @@ 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 71811563..462530e9 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -1557,6 +1557,27 @@ 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],
     }
 
   }