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

Merge pull request #1320 from rsmitty/centos-cert-fix

Browse source 
check if cloud_provider is defined
This commit is contained in:
Spencer Smith 2017-05-31 11:54:15 -04:00 committed by GitHub
commit f4b677eb52
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2
View file

@ -105,7 +105,7 @@ spec:
- mountPath: {{ etcd_cert_dir }} - mountPath: {{ etcd_cert_dir }}
name: etcd-certs name: etcd-certs
readOnly: true readOnly: true
{% if cloud_provider == 'aws' and ansible_os_family == 'RedHat' %} {% if cloud_provider is defined and cloud_provider == 'aws' and ansible_os_family == 'RedHat' %}
- mountPath: /etc/ssl/certs/ca-bundle.crt - mountPath: /etc/ssl/certs/ca-bundle.crt
name: rhel-ca-bundle name: rhel-ca-bundle
readOnly: true readOnly: true
@ -120,7 +120,7 @@ spec:
- hostPath: - hostPath:
path: {{ etcd_cert_dir }} path: {{ etcd_cert_dir }}
name: etcd-certs name: etcd-certs
{% if cloud_provider == 'aws' and ansible_os_family == 'RedHat' %} {% if cloud_provider is defined and cloud_provider == 'aws' and ansible_os_family == 'RedHat' %}
- hostPath: - hostPath:
path: /etc/ssl/certs/ca-bundle.crt path: /etc/ssl/certs/ca-bundle.crt
name: rhel-ca-bundle name: rhel-ca-bundle