kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2054 from ArchiFleKs/os-cloud-provider-domain-fix 

Fix domain id for OpenStack provider
pull/2028/merge
Brad Beam 2017-12-11 21:06:16 -06:00 committed by GitHub
parent 18a616f57c 44b9dce134
commit 802fd94dad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats 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_password: "{{ lookup('env','OS_PASSWORD') }}"
openstack_region: "{{ lookup('env','OS_REGION_NAME') }}" openstack_region: "{{ lookup('env','OS_REGION_NAME') }}"
openstack_tenant_id: "{{ lookup('env','OS_TENANT_ID')|default(lookup('env','OS_PROJECT_ID'),true) }}" 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 # For the vsphere integration, kubelet will need credentials to access
# vsphere apis # vsphere apis

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

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