External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-05-11 11:27:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #190 from teutostack/automatic-cinder-provisioning

Browse Source 
Implemented Dynamic Provisioning of PersistentVolumes with cinder
This commit is contained in:
Smaine Kahlouch
2016-04-01 09:47:29 +02:00
parent a14dfe74e1 8cbdf73eba
commit 34ed6e1a08
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2
View File

@@ -48,5 +48,5 @@ spec:
path: {{ kube_config_dir }} path: {{ kube_config_dir }}
name: kubernetes-config name: kubernetes-config
- hostPath: - hostPath:
path: /usr/share/ca-certificates path: /etc/ssl/certs/
name: ssl-certs-host name: ssl-certs-host

16
roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2
View File

@@ -16,6 +16,10 @@ spec:
- --service-account-private-key-file={{ kube_cert_dir }}/apiserver-key.pem - --service-account-private-key-file={{ kube_cert_dir }}/apiserver-key.pem
- --root-ca-file={{ kube_cert_dir }}/ca.pem - --root-ca-file={{ kube_cert_dir }}/ca.pem
- --v={{ kube_log_level | default('2') }} - --v={{ kube_log_level | default('2') }}
{% if cloud_provider is defined and cloud_provider == "openstack" %}
- --cloud-provider=openstack
- --cloud-config={{ kube_config_dir }}/cloud_config
{% endif %}
livenessProbe: livenessProbe:
httpGet: httpGet:
host: 127.0.0.1 host: 127.0.0.1
@@ -30,10 +34,20 @@ spec:
- mountPath: /etc/ssl/certs - mountPath: /etc/ssl/certs
name: ssl-certs-host name: ssl-certs-host
readOnly: true readOnly: true
{% if cloud_provider is defined and cloud_provider == "openstack" %}
- mountPath: {{ kube_config_dir }}/cloud_config
name: cloudconfig
readOnly: true
{% endif %}
volumes: volumes:
- hostPath: - hostPath:
path: {{ kube_cert_dir }} path: {{ kube_cert_dir }}
name: ssl-certs-kubernetes name: ssl-certs-kubernetes
- hostPath: - hostPath:
path: /usr/share/ca-certificates path: /etc/ssl/certs/
name: ssl-certs-host name: ssl-certs-host
{% if cloud_provider is defined and cloud_provider == "openstack" %}
- hostPath:
path: {{ kube_config_dir }}/cloud_config
name: cloudconfig
{% endif %}