Skip to content

Commit ad14140

Browse files
committed
fix(cinder/nova/neutron): workaround hardcoded --config-file flag in scripts
The --config-file flag is hardcoded in a number of scripts which results in preference to that file over the directories which is not the behavior we want since we want to override. However since the OpenStack Helm charts provide no way to change this behavior we need to replace the entire configmap-bin. This one is taken from two environments which were identical and then had the --config-dir flag added so that it continues to work.
1 parent c589b44 commit ad14140

File tree

9 files changed

+4173
-0
lines changed

9 files changed

+4173
-0
lines changed

components/cinder/configmap-cinder-bin.yaml

Lines changed: 883 additions & 0 deletions
Large diffs are not rendered by default.

components/cinder/kustomization.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,7 @@ resources:
66
- cinder-mariadb-db.yaml
77
- cinder-rabbitmq-queue.yaml
88
- cinder-volume-netapp.yaml
9+
# less than ideal addition but necessary so that we can have the cinder.conf.d loading
10+
# working due to the way the chart hardcodes the config-file parameter which then
11+
# takes precedence over the directory
12+
- configmap-cinder-bin.yaml

components/cinder/values.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,10 @@ manifests:
224224
# that is later consumed via components/openstack helm chart
225225
secret_keystone: false
226226
secret_ks_etc: false
227+
# less than ideal but currently necessary due to the way the chart
228+
# hardcodes the config-file flag which then causes oslo.config to prefer
229+
# that data over the directory which we want to override
230+
configmap_bin: false
227231

228232
annotations:
229233
# we need to modify the annotations on OpenStack Helm

0 commit comments

Comments
 (0)