diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-08 06:15:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-08 06:15:47 +0000 |
| commit | be70e18a27beaa14009ae48bd5474daff82ab077 (patch) | |
| tree | 06b44ad4e9143c98054b02d2bbe63d4e978add5d | |
| parent | 4db1c9f8e4b82e9430e76b1d02542dd6d6b65ef5 (diff) | |
| parent | 287a85005f85d1a9b265528f91093bb69aa8978e (diff) | |
Merge "Add missing ec2api::api::keystone_ec2_tokens_url config" into stable/ocata
| -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 70821396..f6cf13ff 100644 --- a/puppet/services/ec2-api.yaml +++ b/puppet/services/ec2-api.yaml @@ -91,6 +91,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 |