External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-05-08 01:47:37 -02:30
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

3
roles/kubernetes/preinstall/defaults/main.yml
View File

@@ -32,7 +32,8 @@ openstack_username: "{{ lookup('env','OS_USERNAME') }}"
openstack_password: "{{ lookup('env','OS_PASSWORD') }}"
openstack_region: "{{ lookup('env','OS_REGION_NAME') }}"
openstack_tenant_id: "{{ lookup('env','OS_TENANT_ID')|default(lookup('env','OS_PROJECT_ID'),true) }}"
openstack_domain_name: "{{ lookup('env','OS_USER_DOMAIN_NAME') }}"
openstack_domain_name: "{{ lookup('env','OS_USER_DOMAIN_NAME') }}"
openstack_domain_id: "{{ lookup('env','OS_USER_DOMAIN_ID') }}"
# For the vsphere integration, kubelet will need credentials to access
# vsphere apis