openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix keystone settings for Magnum"

Browse Source
This commit is contained in:
Jenkins 2015-11-17 22:20:20 +00:00 committed by Gerrit Code Review
commit 86b778c27f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/magnum/templates/magnum.conf.j2
View File

@ -19,7 +19,7 @@ region_name = {{ openstack_region_name }}
[keystone_authtoken] [keystone_authtoken]
auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }} auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }}
auth_uri = http://{{ kolla_internal_address }}:{{ keystone_admin_port }} auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
auth_plugin = password auth_plugin = password
project_domain_id = default project_domain_id = default
user_domain_id = default user_domain_id = default
@ -29,7 +29,7 @@ password = {{ magnum_keystone_password }}
[trustee] [trustee]
auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }} auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }}
auth_uri = http://{{ kolla_internal_address }}:{{ keystone_admin_port }} auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }}
auth_plugin = password auth_plugin = password
project_domain_id = default project_domain_id = default
user_domain_id = default user_domain_id = default