diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-31 12:40:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-31 12:40:11 +0000 |
| commit | 29a0754982d9ce855fba6fa021a8da61b625c6ad (patch) | |
| tree | 832374ae79495b17c3636d116ea2e43c3c109c87 /puppet | |
| parent | 88381053c2785cce670bf91ebc00177992dc45bc (diff) | |
| parent | 10cb0cfdef9b3a4719f89bcc2cdf1dae4a14dcca (diff) | |
Merge "Add missing ec2api::api::keystone_ec2_tokens_url config"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/services/ec2-api.yaml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/puppet/services/ec2-api.yaml b/puppet/services/ec2-api.yaml index eef2a76f..d1adefe5 100644 --- a/puppet/services/ec2-api.yaml +++ b/puppet/services/ec2-api.yaml @@ -98,6 +98,11 @@ outputs: - {get_param: [EndpointMap, MysqlInternal, host]} - '/ec2_api' - '?read_default_file=/etc/my.cnf.d/tripleo.cnf&read_default_group=tripleo' + ec2api::api::keystone_ec2_tokens_url: + list_join: + - '' + - - {get_param: [EndpointMap, KeystoneV3Internal, uri]} + - '/ec2tokens' - if: - nova_workers_zero |