From 1b519cc300a306d938476c5726538d5696f528dc Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@betacloud-solutions.de>
Date: Mon, 10 Oct 2016 21:02:34 +0200
Subject: [PATCH] Use option auth_type in group trustee in heat configuration
This will solve the following issue:
WARNING oslo_config.cfg [-] Option "auth_plugin" from group "trustee"
is deprecated. Use option "auth_type" from group "trustee".
Change-Id: I7343a4a28555495d22a7960bf4d585152505a79c
Closes-bug: #1632064
---
ansible/roles/heat/templates/heat.conf.j2 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ansible/roles/heat/templates/heat.conf.j2 b/ansible/roles/heat/templates/heat.conf.j2
index b2fad08c4a..c68e4453f1 100644
--- a/ansible/roles/heat/templates/heat.conf.j2
+++ b/ansible/roles/heat/templates/heat.conf.j2
@@ -65,7 +65,7 @@ auth_url = {{ keystone_admin_url }}
auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}
auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
{% endif %}
-auth_plugin = password
+auth_type = password
user_domain_id = default
username = {{ heat_keystone_user }}
password = {{ heat_keystone_password }}