diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-24 10:12:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-24 10:12:28 +0000 |
| commit | ec86b44fc337bb5bb6369907af31214a11d8754f (patch) | |
| tree | 0b5e5f878593aefd1c4eca4c235e63723ab88957 | |
| parent | 31a82052f213908427748421ea7777b4493fe29f (diff) | |
| parent | 7524b3770fedd730bf2c49d26a94135c5357781b (diff) | |
| download | kolla-ec86b44fc337bb5bb6369907af31214a11d8754f.tar.gz kolla-ec86b44fc337bb5bb6369907af31214a11d8754f.zip | |
Merge "Make heat work"
| -rw-r--r-- | ansible/roles/heat/templates/heat.conf.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ansible/roles/heat/templates/heat.conf.j2 b/ansible/roles/heat/templates/heat.conf.j2 index 84e3a548c..8cd48a874 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_user_domain +stack_user_domain_name = heat rpc_backend = rabbit deferred_auth_method = trusts |