aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-11-08 14:43:30 +0000
committerGerrit Code Review <review@openstack.org>2017-11-08 14:43:30 +0000
commit73616922e481b66fc2bfff145d7c1130ce1a6552 (patch)
tree667efb0228bd0950ba6f62a48ac8a0964f903fea /puppet/services
parenta158a257216790d6e295bf81d7a7d99472e45bf7 (diff)
parent9326e34799aebf5cc75624be804368ed7960b4ec (diff)
Merge "nova-placement: switch auth_uri to keystone versionless endpoint" into stable/pike
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/nova-placement.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/services/nova-placement.yaml b/puppet/services/nova-placement.yaml
index 916cefd9..e44a7215 100644
--- a/puppet/services/nova-placement.yaml
+++ b/puppet/services/nova-placement.yaml
@@ -99,7 +99,7 @@ outputs:
- 13778
nova::keystone::authtoken::project_name: 'service'
nova::keystone::authtoken::password: {get_param: NovaPassword}
- nova::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
+ nova::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
nova::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
nova::wsgi::apache_placement::api_port: '8778'
nova::wsgi::apache_placement::ssl: {get_param: EnableInternalTLS}