summaryrefslogtreecommitdiffstats
path: root/puppet/manifests/overcloud_controller.pp
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-04 16:43:39 +0000
committerGerrit Code Review <review@openstack.org>2015-11-04 16:43:39 +0000
commit62f2237cebe941f1d5ca1b3c86df74ff1df4319a (patch)
treebfee982e1227490ff4e191c6194b418d6e17d603 /puppet/manifests/overcloud_controller.pp
parentf453291db56b1504c4e0c0e5df96061ed0950775 (diff)
parent86d6c1ddc76bad423194e789ffb5474e4e12960e (diff)
Merge "Manage keystone initialization directly in t-h-t manifests"
Diffstat (limited to 'puppet/manifests/overcloud_controller.pp')
-rw-r--r--puppet/manifests/overcloud_controller.pp9
1 files changed, 9 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')])