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

fix kube-controller-manager config with openstack-cacert (#3435)

Browse source
This commit is contained in:
Loic Gouarin 2018-10-12 15:39:58 +02:00 committed by k8s-ci-robot
parent 31d8fc086b
commit 36322901a6
2 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -123,7 +123,6 @@ openstack_tenant_id: "{{ lookup('env','OS_TENANT_ID')| default(lookup('env','OS_
openstack_tenant_name: "{{ lookup('env','OS_TENANT_NAME') }}" openstack_tenant_name: "{{ lookup('env','OS_TENANT_NAME') }}"
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') }}" 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 # For the vsphere integration, kubelet will need credentials to access
# vsphere apis # vsphere apis

1
roles/kubespray-defaults/defaults/main.yaml
View file

@ -267,6 +267,7 @@ openstack_lbaas_create_monitor: "yes"
openstack_lbaas_monitor_delay: "1m" openstack_lbaas_monitor_delay: "1m"
openstack_lbaas_monitor_timeout: "30s" openstack_lbaas_monitor_timeout: "30s"
openstack_lbaas_monitor_max_retries: "3" openstack_lbaas_monitor_max_retries: "3"
openstack_cacert: "{{ lookup('env','OS_CACERT') }}"
## List of authorization modes that must be configured for ## List of authorization modes that must be configured for
## the k8s cluster. Only 'AlwaysAllow', 'AlwaysDeny', 'Node' and ## the k8s cluster. Only 'AlwaysAllow', 'AlwaysDeny', 'Node' and