diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-29 15:39:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-29 15:39:05 +0000 |
| commit | 4ca9b5111f1c694ae34193361bc4f3555c7cfb3e (patch) | |
| tree | 3bb6c16cf408657b2c817789cc667e3f6e4f5d83 | |
| parent | 5fbdee9bbf2d682abc310355cd828a86966319f6 (diff) | |
| parent | 57ba2cd22f5b0ff1c38d0ec3ffdc8ab83b788ba2 (diff) | |
| download | kolla-4ca9b5111f1c694ae34193361bc4f3555c7cfb3e.tar.gz kolla-4ca9b5111f1c694ae34193361bc4f3555c7cfb3e.zip | |
Merge "Fix wrong heat trustee configuration"
| -rw-r--r-- | ansible/roles/heat/templates/heat.conf.j2 | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ansible/roles/heat/templates/heat.conf.j2 b/ansible/roles/heat/templates/heat.conf.j2 index fdc624edd..b2fad08c4 100644 --- a/ansible/roles/heat/templates/heat.conf.j2 +++ b/ansible/roles/heat/templates/heat.conf.j2 @@ -66,9 +66,7 @@ auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_publi auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }} {% endif %} auth_plugin = password -project_domain_id = default user_domain_id = default -project_name = service username = {{ heat_keystone_user }} password = {{ heat_keystone_password }} |