aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorSven Anderson <sven@redhat.com>2017-03-27 21:39:00 +0200
committerSven Anderson <sven@redhat.com>2017-04-03 16:31:11 +0200
commit287a85005f85d1a9b265528f91093bb69aa8978e (patch)
tree344156d18aa21557035f74162a3ae816fc6bcb24 /puppet/services
parent96fc0659c3736f752927a4bce3550678bf3bb44e (diff)
Add missing ec2api::api::keystone_ec2_tokens_url config
Change-Id: I9a19aff24dede2bea3bf2959afa7adde00817ee0 Related-Bug: #1676491 (cherry picked from commit 10cb0cfdef9b3a4719f89bcc2cdf1dae4a14dcca)
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/ec2-api.yaml5
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