From: Sven Anderson <sven@redhat.com>
Date: Mon, 27 Mar 2017 19:39:00 +0000 (+0200)
Subject: Add missing ec2api::api::keystone_ec2_tokens_url config
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=287a85005f85d1a9b265528f91093bb69aa8978e;p=apex-tripleo-heat-templates.git

Add missing ec2api::api::keystone_ec2_tokens_url config

Change-Id: I9a19aff24dede2bea3bf2959afa7adde00817ee0
Related-Bug: #1676491
(cherry picked from commit 10cb0cfdef9b3a4719f89bcc2cdf1dae4a14dcca)
---

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