Skip to content

Commit e0eb0de

Browse files
committed
fix(cinder): create default netapp_nvme config section
Creates a default netapp_nvme section so that cinder-volume loads without missing the section. cinder-volume will still not start by default unless it can communicate with a netapp unfortunately. A better default will be needed for test environments.
1 parent 71148fa commit e0eb0de

File tree

3 files changed

+10
-48
lines changed

3 files changed

+10
-48
lines changed

components/cinder/cinder-volume-netapp.yaml

Lines changed: 0 additions & 43 deletions
This file was deleted.

components/cinder/kustomization.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ kind: Kustomization
55
resources:
66
- cinder-mariadb-db.yaml
77
- cinder-rabbitmq-queue.yaml
8-
- cinder-volume-netapp.yaml
98
# less than ideal addition but necessary so that we can have the cinder.conf.d loading
109
# working due to the way the chart hardcodes the config-file parameter which then
1110
# takes precedence over the directory

components/cinder/values.yaml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ conf:
55
backends:
66
# disable the hardcoded one in the OpenStack Helm values.yaml
77
rbd1: null
8+
netapp_nvme:
9+
netapp_server_port: "443"
10+
netapp_storage_family: ontap_cluster
11+
netapp_storage_protocol: nvme
12+
netapp_transport_type: https
13+
netapp_use_legacy_client: false
14+
volume_backend_name: netapp_nvme
15+
volume_driver: cinder_understack.dynamic_netapp_driver.NetappCinderDynamicDriver
816
cinder:
917
DEFAULT:
1018
enabled_backends: netapp_nvme
@@ -74,10 +82,8 @@ pod:
7482
- secret:
7583
name: cinder-ks-etc
7684
- secret:
77-
name: volume-backend
78-
items:
79-
- key: netapp_nvme.conf
80-
path: netapp_nvme.conf
85+
name: cinder-netapp-config
86+
optional: true
8187
cinder_volume_usage_audit:
8288
cinder_volume_usage_audit:
8389
volumeMounts:

0 commit comments

Comments
 (0)