diff options
author | 2017-02-14 13:39:26 +0000 | |
---|---|---|
committer | 2017-02-14 13:39:26 +0000 | |
commit | d6794ec1d30898b25d6c0950bd0e02f3327b2999 (patch) | |
tree | 2dd7d61374358e70efb66cf5b69cc80c8f680acc /puppet/services/ec2-api.yaml | |
parent | 242fe1bdfef406d4ca3cd59033fe3c5877ffeec4 (diff) | |
parent | d1eb0bc0dc1955c70e262101d07d857a35682333 (diff) |
Merge "Use Keystone internal endpoint instead of admin for services"
Diffstat (limited to 'puppet/services/ec2-api.yaml')
-rw-r--r-- | puppet/services/ec2-api.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/services/ec2-api.yaml b/puppet/services/ec2-api.yaml index 7049d773..002342b6 100644 --- a/puppet/services/ec2-api.yaml +++ b/puppet/services/ec2-api.yaml @@ -66,7 +66,7 @@ outputs: ec2api::keystone::authtoken::project_name: 'service' ec2api::keystone::authtoken::password: {get_param: Ec2ApiPassword} ec2api::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] } - ec2api::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]} + ec2api::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} ec2api::api::enabled: true ec2api::package_manage: {get_param: EnablePackageInstall} ec2api::api::ec2api_listen: |