From 1c177f382753e9d1854b9959f3118e7636cb533e Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Thu, 24 Mar 2016 12:47:37 +0000 Subject: [PATCH] Revert "Make heat work" This reverts commit 7524b3770fedd730bf2c49d26a94135c5357781b. Liberty uses heat_user_domain and works and this should too. The bootstrap process itself must have changed or another part of the config. Either way that needs to be fixed so we can do proper upgrades. Basically, dont change the heat domain out from under the user). Change-Id: I32ae3ef90d340a83b09c09860af8f3635c1a07a5 --- 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 8cd48a874f..84e3a548c7 100644 --- a/ansible/roles/heat/templates/heat.conf.j2 +++ b/ansible/roles/heat/templates/heat.conf.j2 @@ -9,7 +9,7 @@ heat_waitcondition_server_url = {{ public_protocol }}://{{ kolla_external_fqdn } stack_domain_admin = heat_domain_admin stack_domain_admin_password = {{ heat_domain_admin_password }} -stack_user_domain_name = heat +stack_user_domain_name = heat_user_domain rpc_backend = rabbit deferred_auth_method = trusts