openstack
/
kolla-ansible
Code Issues Proposed changes

Merge "Fixing authentication url for kubernetes"

This commit is contained in:
Jenkins 2017-02-09 03:48:33 +00:00 committed by Gerrit Code Review
parent e2f6c30e81 40ce12bd04
commit 90eb3c4818
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -218,7 +218,11 @@ max_attempts = 10
[placement]
auth_type = password
{% if orchestration_engine == 'KUBERNETES' %}
auth_url = {{ keystone_admin_url }}
{% else %}
auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
{% endif %}
username = {{ placement_keystone_user }}
password = {{ placement_keystone_password }}
user_domain_name = default