openstack/openstack-helm
Code Issues Proposed changes

Merge "Replace remaining usage of policy.json"

Browse Source
This commit is contained in:
Zuul
2025-12-18 19:53:44 +00:00
committed by Gerrit Code Review
parent 9b270fe356 bb0371b425
commit fe418b0442
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gnocchi/templates/configmap-etc.yaml
View File

@@ -96,6 +96,6 @@ type: Opaque
data: data:
gnocchi.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.gnocchi | b64enc }} gnocchi.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.gnocchi | b64enc }}
api-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | b64enc }} api-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | b64enc }}
policy.json: {{ toJson .Values.conf.policy | b64enc }} policy.yaml: {{ toYaml .Values.conf.policy | b64enc }}
{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.apache "key" "wsgi-gnocchi.conf" "format" "Secret" ) | indent 2 }} {{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.apache "key" "wsgi-gnocchi.conf" "format" "Secret" ) | indent 2 }}
{{- end }} {{- end }}

4
gnocchi/templates/daemonset-metricd.yaml
View File

@@ -82,8 +82,8 @@ spec:
subPath: gnocchi.conf subPath: gnocchi.conf
readOnly: true readOnly: true
- name: gnocchi-etc - name: gnocchi-etc
mountPath: /etc/gnocchi/policy.json mountPath: /etc/gnocchi/policy.yaml
subPath: policy.json subPath: policy.yaml
readOnly: true readOnly: true
- name: gnocchi-bin - name: gnocchi-bin
mountPath: /tmp/gnocchi-metricd.sh mountPath: /tmp/gnocchi-metricd.sh

4
gnocchi/templates/daemonset-statsd.yaml
View File

@@ -88,8 +88,8 @@ spec:
subPath: api-paste.ini subPath: api-paste.ini
readOnly: true readOnly: true
- name: gnocchi-etc - name: gnocchi-etc
mountPath: /etc/gnocchi/policy.json mountPath: /etc/gnocchi/policy.yaml
subPath: policy.json subPath: policy.yaml
readOnly: true readOnly: true
- name: gnocchi-bin - name: gnocchi-bin
mountPath: /tmp/gnocchi-statsd.sh mountPath: /tmp/gnocchi-statsd.sh

4
gnocchi/templates/deployment-api.yaml
View File

@@ -105,8 +105,8 @@ spec:
readOnly: true readOnly: true
{{- end }} {{- end }}
- name: gnocchi-etc - name: gnocchi-etc
mountPath: /etc/gnocchi/policy.json mountPath: /etc/gnocchi/policy.yaml
subPath: policy.json subPath: policy.yaml
readOnly: true readOnly: true
- name: gnocchi-etc - name: gnocchi-etc
mountPath: /etc/apache2/conf-enabled/wsgi-gnocchi.conf mountPath: /etc/apache2/conf-enabled/wsgi-gnocchi.conf

2
watcher/templates/configmap-etc.yaml
View File

@@ -83,7 +83,7 @@ data:
rally_tests.yaml: {{ toYaml .Values.conf.rally_tests.tests | b64enc }} rally_tests.yaml: {{ toYaml .Values.conf.rally_tests.tests | b64enc }}
watcher.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.watcher | b64enc }} watcher.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.watcher | b64enc }}
logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | b64enc }} logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | b64enc }}
policy.json: {{ toJson .Values.conf.policy | b64enc }} policy.yaml: {{ toYaml .Values.conf.policy | b64enc }}
{{- range $key, $value := $envAll.Values.conf.rally_tests.templates }} {{- range $key, $value := $envAll.Values.conf.rally_tests.templates }}
{{ printf "test_template_%d" $key }}: {{ $value.template | b64enc }} {{ printf "test_template_%d" $key }}: {{ $value.template | b64enc }}
{{- end }} {{- end }}

4
watcher/templates/deployment-api.yaml
View File

@@ -91,8 +91,8 @@ spec:
subPath: {{ base .Values.conf.watcher.DEFAULT.log_config_append }} subPath: {{ base .Values.conf.watcher.DEFAULT.log_config_append }}
readOnly: true readOnly: true
- name: watcher-etc - name: watcher-etc
mountPath: /etc/watcher/policy.json mountPath: /etc/watcher/policy.yaml
subPath: policy.json subPath: policy.yaml
readOnly: true readOnly: true
{{ if $mounts_watcher_api.volumeMounts }}{{ toYaml $mounts_watcher_api.volumeMounts | indent 12 }}{{ end }} {{ if $mounts_watcher_api.volumeMounts }}{{ toYaml $mounts_watcher_api.volumeMounts | indent 12 }}{{ end }}
volumes: volumes: