diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-20 16:10:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-20 16:10:13 +0000 |
| commit | 9b7ded1a1c38d846bcb84dd2714a8bff0b7f3f03 (patch) | |
| tree | c5edd37f642e939f694440a386686028f3f95316 /ansible | |
| parent | 27b0c907b5dc5b20cc9683387911d5429224eb41 (diff) | |
| parent | 1b519cc300a306d938476c5726538d5696f528dc (diff) | |
| download | kolla-9b7ded1a1c38d846bcb84dd2714a8bff0b7f3f03.tar.gz kolla-9b7ded1a1c38d846bcb84dd2714a8bff0b7f3f03.zip | |
Merge "Use option auth_type in group trustee in heat configuration"
Diffstat (limited to 'ansible')
| -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 b2fad08c4..c68e4453f 100644 --- a/ansible/roles/heat/templates/heat.conf.j2 +++ b/ansible/roles/heat/templates/heat.conf.j2 @@ -65,7 +65,7 @@ auth_url = {{ keystone_admin_url }} auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }} auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }} {% endif %} -auth_plugin = password +auth_type = password user_domain_id = default username = {{ heat_keystone_user }} password = {{ heat_keystone_password }} |