External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-16 18:50:08 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2342 from southquist/add-ca-cert

Browse Source 
allow for setting the cacert on openstack cloud provider
This commit is contained in:
Rong Zhang
2018-08-07 17:46:01 +08:00
committed by GitHub
parent 9075dbdd3c c685dc493f
commit c288ffc55d
5 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
roles/kubernetes/node/defaults/main.yml
View File

@@ -114,6 +114,7 @@ openstack_tenant_id: "{{ lookup('env','OS_TENANT_ID')| default(lookup('env','OS_
openstack_tenant_name: "{{ lookup('env','OS_TENANT_NAME') }}"
openstack_domain_name: "{{ lookup('env','OS_USER_DOMAIN_NAME') }}"
openstack_domain_id: "{{ lookup('env','OS_USER_DOMAIN_ID') }}"
openstack_cacert: "{{ lookup('env','OS_CACERT') }}"
# For the vsphere integration, kubelet will need credentials to access
# vsphere apis

3
roles/kubernetes/node/templates/openstack-cloud-config.j2
View File

@@ -12,6 +12,9 @@ domain-name="{{ openstack_domain_name }}"
{% elif openstack_domain_id is defined and openstack_domain_id != "" %}
domain-id ="{{ openstack_domain_id }}"
{% endif %}
{% if openstack_cacert is defined and openstack_cacert != "" %}
ca-file="{{ kube_config_dir }}/openstack-cacert.pem"
{% endif %}
{% if openstack_blockstorage_version is defined %}
[BlockStorage]