From cb43cbcc932e3a8d7f8bade6a492de4a4638ab90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Fri, 11 Mar 2016 18:09:39 +0900 Subject: [PATCH] Use variables for auth_uri and auth_url protocols Change-Id: Icf5de0684b10c32cc6e29b62d183705d423b4333 Closes-Bug: #1555989 --- ansible/roles/heat/templates/heat.conf.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/heat/templates/heat.conf.j2 b/ansible/roles/heat/templates/heat.conf.j2 index 3f2445dc24..8fd20fdfd3 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