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

Fix Cinder CSI bugs (#5492)

Browse Source
This commit is contained in:
Ali Sanhaji
2020-02-17 10:49:28 +01:00
committed by GitHub
parent 57b0b6a9b1
commit d56e9f6b80
4 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/kubernetes-apps/csi_driver/cinder/templates/cinder-csi-cloud-config.j2
View File

@@ -3,9 +3,7 @@ auth-url="{{ cinder_auth_url }}"
username="{{ cinder_username }}"
password="{{ cinder_password }}"
region="{{ cinder_region }}"
{% if cinder_trust_id is defined and cinder_trust_id != "" %}
trust-id="{{ cinder_trust_id }}"
{% else %}
{% if cinder_tenant_id is defined and cinder_tenant_id != "" %}
tenant-id="{{ cinder_tenant_id }}"
{% endif %}
{% if cinder_tenant_name is defined and cinder_tenant_name != "" %}

4
roles/kubernetes-apps/csi_driver/cinder/templates/cinder-csi-controllerplugin.yml.j2
View File

@@ -90,7 +90,7 @@ spec:
- name: secret-cinderplugin
mountPath: /etc/config
readOnly: true
{% if cinder_cacert is defined %}
{% if cinder_cacert is defined and cinder_cacert != "" %}
- name: cinder-cacert
mountPath: {{ kube_config_dir }}/cinder-cacert.pem
readOnly: true
@@ -101,7 +101,7 @@ spec:
- name: secret-cinderplugin
secret:
secretName: cloud-config
{% if cinder_cacert is defined %}
{% if cinder_cacert is defined and cinder_cacert != "" %}
- name: cinder-cacert
hostPath:
path: {{ kube_config_dir }}/cinder-cacert.pem