summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-28 07:34:22 +0000
committerGerrit Code Review <review@openstack.org>2015-07-28 07:34:22 +0000
commit53ed88a19ae5b57a1fc8bd9a31e7b7f1526bf7bb (patch)
tree79a308f2ead9bcc36544383e2fbe3e0220192c60 /puppet
parent8c9e3447088a2bf5f69f149248dcf221d1be26c9 (diff)
parentfad5d6da2e0ef01c457ac745c80898dea4810d86 (diff)
Merge "Keystone token flushing"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/hieradata/controller.yaml3
-rw-r--r--puppet/manifests/overcloud_controller.pp4
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp2
3 files changed, 9 insertions, 0 deletions
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 25719709..1ae076d2 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -40,6 +40,9 @@ swift::proxy::authtoken::admin_tenant_name: 'service'
ceilometer::api::keystone_tenant: 'service'
heat::keystone_tenant: 'service'
+# keystone
+keystone::cron::token_flush::maxdelay: 3600
+
#swift
swift::proxy::pipeline:
- 'catch_errors'
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 09edef50..f8ffb8fb 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -486,3 +486,7 @@ if hiera('step') >= 3 {
hiera_include('controller_classes')
} #END STEP 3
+
+if hiera('step') >= 4 {
+ include ::keystone::cron::token_flush
+} #END STEP 4
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index a3eb6e5d..8303245f 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -902,6 +902,8 @@ if hiera('step') >= 3 {
} #END STEP 3
if hiera('step') >= 4 {
+ include ::keystone::cron::token_flush
+
if $pacemaker_master {
# Keystone