diff options
| author | liyingjun <yingjun.li@kylin-cloud.com> | 2016-09-19 15:52:16 +0800 |
|---|---|---|
| committer | Li Yingjun <yingjun.li@kylin-cloud.com> | 2016-09-20 09:05:21 +0000 |
| commit | 2d634e5eb3f2461f5f50abf4c79906a9f099bac2 (patch) | |
| tree | e8f2829a4296a4896be08aa5516d30e31764aab3 | |
| parent | d75847772d0e880329eef5867caf4b87035d2ae0 (diff) | |
| download | kolla-2d634e5eb3f2461f5f50abf4c79906a9f099bac2.tar.gz kolla-2d634e5eb3f2461f5f50abf4c79906a9f099bac2.zip | |
Fix murano auth issue
According to installation guide from murano[1] and devstack sample config[2],
some of the configurations for keystone auth need to be changed.
[1]: http://docs.openstack.org/developer/murano/install/manual.html#install-the-api-service-and-engine
[2]: https://github.com/openstack/murano/blob/master/devstack/plugin.sh#L187-L194
Change-Id: I01f9fcf3d6eb849392c4717f8e4c78be069351a2
Closes-bug: #1624957
Closes-bug: #1621693
| -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 }} |