1 files changed, 9 insertions, 4 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-heat/heat.conf b/meta-openstack/recipes-devtools/python/python-heat/heat.conf
index 2ff8adb..da72987 100644
--- a/meta-openstack/recipes-devtools/python/python-heat/heat.conf
+++ b/meta-openstack/recipes-devtools/python/python-heat/heat.conf
@@ -4,10 +4,6 @@
 # Options defined in heat.common.config
 #
 
-admin_tenant_name = %SERVICE_TENANT_NAME%
-admin_user = heat
-admin_password = %ADMIN_PASSWORD%
-
 # The SQLAlchemy connection string used to connect to the
 # database (string value)
 #sql_connection=mysql://heat:heat@localhost/heat
@@ -728,4 +724,13 @@ sql_connection=postgresql://%DB_USER%:%DB_PASSWORD%@localhost/heat
 # Password for Redis server. (optional) (string value)
 #password=<None>
 
+[keystone_authtoken]
+auth_host = %CONTROLLER_IP%
+auth_port = 35357
+auth_protocol = http
+auth_uri = http://%CONTROLLER_IP%:5000/v2.0
+
+admin_tenant_name = %SERVICE_TENANT_NAME%
+admin_user = heat
+admin_password = %ADMIN_PASSWORD%