epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-28 09:39:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix domain id for OpenStack provider

Browse Source 
OpenStack authentication does not support using a mix of DomainID and
DomainName, only one or the other should be used.
This commit is contained in:
ArchiFleKs
2017-12-11 15:57:33 +01:00
parent 9643c2c1e3
commit 44b9dce134
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/kubernetes/preinstall/templates/openstack-cloud-config.j2
View File

@@ -6,6 +6,8 @@ region="{{ openstack_region }}"
tenant-id="{{ openstack_tenant_id }}"
{% if openstack_domain_name is defined and openstack_domain_name != "" %}
domain-name="{{ openstack_domain_name }}"
{% elif openstack_domain_id is defined and openstack_domain_id != "" %}
domain-id ="{{ openstack_domain_id }}"
{% endif %}
{% if openstack_blockstorage_version is defined %}