aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-26 14:10:27 +0000
committerGerrit Code Review <review@openstack.org>2017-03-26 14:10:27 +0000
commit553b78f40830369dd2bca748157e1ee18df11de5 (patch)
tree4e243f8f0db4c308ca884421dcfeac6727644349 /puppet/services
parent3e203cbee8ce54ce761870e6ecfa25b38332ace9 (diff)
parent803da62a305a31101e5d408af26a243f43fa33ef (diff)
Merge "Deploy versionless keystone endpoints (for keystone only)" into stable/ocata
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/keystone.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml
index a85a9ed0..f40c8d99 100644
--- a/puppet/services/keystone.yaml
+++ b/puppet/services/keystone.yaml
@@ -226,6 +226,7 @@ outputs:
keystone::endpoint::internal_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
keystone::endpoint::admin_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
keystone::endpoint::region: {get_param: KeystoneRegion}
+ keystone::endpoint::version: ''
keystone_enable_db_purge: {get_param: KeystoneEnableDBPurge}
keystone::rabbit_heartbeat_timeout_threshold: 60
keystone::cron::token_flush::maxdelay: 3600