diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-07-15 12:36:25 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-07-15 12:36:25 +0000 |
| commit | 1a1ae9444e275471709aafd2160275411261da83 (patch) | |
| tree | 43fc97ae0c1a1d107183410b41f3847e828ff440 /puppet | |
| parent | 31dc73cbaa86dd723de28eca69d159a4860429dc (diff) | |
| parent | 63eb8ec6cfca99a496f55638e521e60e51804001 (diff) | |
Merge "Configure Heat's ec2 auth uri correctly"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/controller-puppet.yaml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index 6e399b50..324553e8 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -686,6 +686,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} @@ -935,6 +941,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} |