openstack
/
openstack-ansible-os_magnum
Code Issues Proposed changes

Merge "Use keystone_auth for credentials"

This commit is contained in:
Zuul 2018-07-31 19:04:15 +00:00 committed by Gerrit Code Review
parent e539056dc1 abf2d03b5b
commit 2bfb3b54c0
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
templates/magnum.conf.j2
View File

@ -24,6 +24,21 @@ endpoint_type = internalURL
[heat_client]
endpoint_type = internalURL
[keystone_auth]
auth_uri = {{ keystone_service_internalurl }}
auth_version = v3
insecure = {{ keystone_service_internaluri_insecure | bool }}
memcached_servers = {{ memcached_servers }}
token_cache_time = 300
identity_uri = {{ keystone_service_internaluri }}
auth_type = {{ magnum_keystone_auth_plugin }}
auth_url = {{ keystone_service_internaluri }}
project_domain_name = {{ magnum_service_project_domain_name }}
user_domain_name = {{ magnum_service_user_domain_name }}
project_name = {{ magnum_service_project_name }}
username = {{ magnum_service_user_name }}
password = {{ magnum_service_password }}
[keystone_authtoken]
auth_uri = {{ keystone_service_internalurl }}
auth_version = v3
@ -38,11 +53,6 @@ user_domain_name = {{ magnum_service_user_domain_name }}
project_name = {{ magnum_service_project_name }}
username = {{ magnum_service_user_name }}
password = {{ magnum_service_password }}
#TODO(chris_hultin)
#Remove once https://bugs.launchpad.net/magnum/+bug/1594888 is closed
admin_user = {{ magnum_service_user_name }}
admin_tenant_name = {{ magnum_service_project_name }}
admin_password = {{ magnum_service_password }}
[magnum_client]
endpoint_type = publicURL