C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1087 from bradbeam/openstack

Browse source 
Adding openstack domain id
This commit is contained in:
Matthew Mosesohn 2017-03-16 17:53:14 +03:00 committed by GitHub
commit b0830f0cd7
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
roles/kubernetes/preinstall/defaults/main.yml
View file

@ -28,6 +28,7 @@ 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') }}"
# For the vsphere integration, kubelet will need credentials to access
# vsphere apis

5
roles/kubernetes/preinstall/templates/openstack-cloud-config.j2
View file

@ -3,4 +3,7 @@ auth-url={{ openstack_auth_url }}
username={{ openstack_username }}
password={{ openstack_password }}
region={{ openstack_region }}
tenant-id={{ openstack_tenant_id }}
tenant-id={{ openstack_tenant_id }}
{% if openstack_domain_name is defined and openstack_domain_name != "" %}
domain-name={{ openstack_domain_name }}
{% endif %}