C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
roles/kubernetes-apps/csi_driver/cinder/defaults/main.yml
View file

@ -6,11 +6,12 @@ cinder_auth_url: "{{ lookup('env','OS_AUTH_URL') }}"
cinder_username: "{{ lookup('env','OS_USERNAME') }}"
cinder_password: "{{ lookup('env','OS_PASSWORD') }}"
cinder_region: "{{ lookup('env','OS_REGION_NAME') }}"
cinder_tenant_id: "{{ lookup('env','OS_TENANT_ID')| default(lookup('env','OS_PROJECT_ID')|default(lookup('env','OS_PROJECT_NAME'),true),true) }}"
cinder_tenant_name: "{{ lookup('env','OS_TENANT_NAME') }}"
cinder_tenant_id: "{{ lookup('env','OS_TENANT_ID')| default(lookup('env','OS_PROJECT_ID'),true) }}"
cinder_tenant_name: "{{ lookup('env','OS_TENANT_NAME')| default(lookup('env','OS_PROJECT_NAME'),true) }}"
cinder_domain_name: "{{ lookup('env','OS_USER_DOMAIN_NAME') }}"
cinder_domain_id: "{{ lookup('env','OS_USER_DOMAIN_ID') }}"
cinder_cacert: "{{ lookup('env','OS_CACERT') }}"
# For now, only Cinder v3 is supported in Cinder CSI driver
cinder_blockstorage_version: "v3"
cinder_csi_controller_replicas: 1

10
roles/kubernetes-apps/csi_driver/cinder/tasks/cinder-credential-check.yml
View file

@ -21,14 +21,14 @@
- name: Cinder CSI Driver | check cinder_tenant_id value
fail:
msg: "one of cinder_tenant_id or cinder_trust_id must be specified"
msg: "one of cinder_tenant_id or cinder_tenant_name must be specified"
when:
- cinder_tenant_id is not defined or not cinder_tenant_id
- cinder_trust_id is not defined
- cinder_tenant_name is not defined
- name: Cinder CSI Driver | check cinder_trust_id value
- name: Cinder CSI Driver | check cinder_tenant_name value
fail:
msg: "one of cinder_tenant_id or cinder_trust_id must be specified"
msg: "one of cinder_tenant_id or cinder_tenant_name must be specified"
when:
- cinder_trust_id is not defined or not cinder_trust_id
- cinder_tenant_name is not defined or not cinder_tenant_name
- cinder_tenant_id is not defined

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