Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add a default setting for BondInterfaceOvsOptions"
[apex-tripleo-heat-templates.git]
/
puppet
/
hieradata
/
controller.yaml
diff --git
a/puppet/hieradata/controller.yaml
b/puppet/hieradata/controller.yaml
index
2571970
..
1ae076d
100644
(file)
--- 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'
ceilometer::api::keystone_tenant: 'service'
heat::keystone_tenant: 'service'
+# keystone
+keystone::cron::token_flush::maxdelay: 3600
+
#swift
swift::proxy::pipeline:
- 'catch_errors'
#swift
swift::proxy::pipeline:
- 'catch_errors'