From: Ben Nemec <bnemec@redhat.com>
Date: Mon, 6 Jul 2015 16:05:43 +0000 (-0500)
Subject: Configure Heat's ec2 auth uri correctly
X-Git-Tag: opnfv-6.0.0~2438^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=63eb8ec6cfca99a496f55638e521e60e51804001;p=apex-tripleo-heat-templates.git

Configure Heat's ec2 auth uri correctly

We weren't configuring the Heat ec2 auth uri, so it was using the
default pointing at localhost.  This won't work in most setups
because Keystone listens on specific addresses not including
localhost, so configure it to use the proper Keystone address.

Change-Id: I979a87c68a8f6f558ccfc04662c158c89fcf1388
---

diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index 5a356bcc..a39fb002 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -670,6 +670,12 @@ resources:
             - - 'http://'
               - {get_param: KeystonePublicApiVirtualIP}
               - ':5000/v2.0/'
+        keystone_ec2_uri:
+          list_join:
+            - ''
+            - - 'http://'
+              - {get_param: KeystonePublicApiVirtualIP}
+              - ':5000/v2.0/ec2tokens'
         enable_fencing: {get_param: EnableFencing}
         enable_galera: {get_param: EnableGalera}
         enable_ceph_storage: {get_param: EnableCephStorage}
@@ -914,6 +920,7 @@ resources:
                 heat::rabbit_use_ssl: {get_input: rabbit_client_use_ssl}
                 heat::rabbit_port: {get_input: rabbit_client_port}
                 heat::auth_uri: {get_input: keystone_auth_uri}
+                heat::keystone_ec2_uri: {get_input: keystone_ec2_uri}
                 heat::identity_uri: {get_input: keystone_identity_uri}
                 heat::keystone_password: {get_input: heat_password}
                 heat::api::bind_host: {get_input: heat_api_network}