Merge "nova-placement: switch auth_uri to keystone versionless endpoint" into stable...
authorZuul <zuul@review.openstack.org>
Wed, 8 Nov 2017 14:43:30 +0000 (14:43 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 8 Nov 2017 14:43:30 +0000 (14:43 +0000)
puppet/services/nova-placement.yaml

index 916cefd..e44a721 100644 (file)
@@ -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}