diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-25 03:26:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-25 03:26:48 +0000 |
| commit | 9dcbb443d934934ab1377dc212d7f1ad1c818e8a (patch) | |
| tree | b7c57ea31f8ac3e57155fb0549a991555f8c6f1f | |
| parent | 1ac8e643694e35074e4431fc3d49920da1eef3ba (diff) | |
| parent | 1c177f382753e9d1854b9959f3118e7636cb533e (diff) | |
| download | kolla-9dcbb443d934934ab1377dc212d7f1ad1c818e8a.tar.gz kolla-9dcbb443d934934ab1377dc212d7f1ad1c818e8a.zip | |
Merge "Revert "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 8cd48a874..84e3a548c 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 |