aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin André <m.andre@redhat.com>2016-03-11 18:09:39 +0900
committerMartin André <m.andre@redhat.com>2016-03-11 18:09:39 +0900
commitcb43cbcc932e3a8d7f8bade6a492de4a4638ab90 (patch)
tree7ad220651827aa7af6c97a89de6e1c2740d8d693
parent19bdb0934eff63fb3349173782e4c6631b19a7f5 (diff)
downloadkolla-cb43cbcc932e3a8d7f8bade6a492de4a4638ab90.tar.gz
kolla-cb43cbcc932e3a8d7f8bade6a492de4a4638ab90.zip
Use variables for auth_uri and auth_url protocols
Change-Id: Icf5de0684b10c32cc6e29b62d183705d423b4333 Closes-Bug: #1555989
-rw-r--r--ansible/roles/heat/templates/heat.conf.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/ansible/roles/heat/templates/heat.conf.j2 b/ansible/roles/heat/templates/heat.conf.j2
index 3f2445dc2..8fd20fdfd 100644
--- a/ansible/roles/heat/templates/heat.conf.j2
+++ b/ansible/roles/heat/templates/heat.conf.j2
@@ -48,8 +48,8 @@ username = {{ heat_keystone_user }}
password = {{ heat_keystone_password }}
[trustee]
-auth_uri = http://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}
-auth_url = http://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
+auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}
+auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
auth_plugin = password
project_domain_id = default
user_domain_id = default