diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-21 16:41:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-21 16:41:39 +0000 |
| commit | c8329d884fa231fad892543829f9ea5f9c5934ff (patch) | |
| tree | aa797b97a93e5b8f7d63d06a18ecd033e358033d | |
| parent | 717429bb22a8bdd15ca87a0efa438604c172f4c5 (diff) | |
| parent | 2d634e5eb3f2461f5f50abf4c79906a9f099bac2 (diff) | |
| download | kolla-c8329d884fa231fad892543829f9ea5f9c5934ff.tar.gz kolla-c8329d884fa231fad892543829f9ea5f9c5934ff.zip | |
Merge "Fix murano auth issue"
| -rw-r--r-- | ansible/roles/murano/templates/murano.conf.j2 | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ansible/roles/murano/templates/murano.conf.j2 b/ansible/roles/murano/templates/murano.conf.j2 index fab7554b4..7b0cfd408 100644 --- a/ansible/roles/murano/templates/murano.conf.j2 +++ b/ansible/roles/murano/templates/murano.conf.j2 @@ -17,12 +17,14 @@ workers = {{ openstack_service_workers }} connection = mysql+pymysql://{{ murano_database_user }}:{{ murano_database_password }}@{{ murano_database_address }}/{{ murano_database_name }} max_retries = -1 +[keystone] +auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }} + [keystone_authtoken] auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }} -identity_uri = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }} -auth_type = password -project_domain_id = default -user_domain_id = default +auth_host = {{ kolla_internal_fqdn }} +auth_port = {{ keystone_public_port }} +auth_protocol = {{ internal_protocol }} admin_tenant_name = service admin_user = {{ murano_keystone_user }} admin_password = {{ murano_keystone_password }} |