openstack
/
openstack-helm
Code Issues Proposed changes

Openstack: Use k8s secret to store config 

This PS moves openstack components in OSH to use secrets to store
potentially sensitive config information.

Depends-On: https://review.openstack.org/#/c/593732

Change-Id: I9bab586c03597effea0e48a58c69efff3f980a92
Signed-off-by: Pete Birley <pete@port.direct>
This commit is contained in:
Pete Birley 2018-08-08 14:56:30 -05:00
parent a39e2c036f
commit 83b91e6e1b
96 changed files with 312 additions and 385 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
barbican/templates/configmap-etc.yaml
View File

@ -86,20 +86,15 @@ limitations under the License.
{{- end -}}
---
apiVersion: v1
kind: ConfigMap
kind: Secret
metadata:
name: barbican-etc
type: Opaque
data:
barbican.conf: |
{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.barbican | indent 4 }}
logging.conf: |
{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | indent 4 }}
barbican-api-paste.ini: |
{{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }}
api_audit_map.conf: |
{{ include "helm-toolkit.utils.to_ini" .Values.conf.audit_map | indent 4 }}
policy.json: |
{{ toJson .Values.conf.policy | indent 4 }}
barbican-api.ini: |
{{ include "helm-toolkit.utils.to_ini" .Values.conf.barbican_api | indent 4 }}
barbican.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.barbican | b64enc }}
logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | b64enc }}
barbican-api-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | b64enc }}
api_audit_map.conf: {{ include "helm-toolkit.utils.to_ini" .Values.conf.audit_map | b64enc }}
policy.json: {{ toJson .Values.conf.policy | b64enc }}
barbican-api.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.barbican_api | b64enc }}
{{- end }}

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

@ -107,8 +107,8 @@ spec:
- name: etcbarbican
emptyDir: {}
- name: barbican-etc
configMap:
name: barbican-etc
secret:
secretName: barbican-etc
defaultMode: 0444
- name: barbican-bin
configMap:

29
ceilometer/templates/configmap-etc.yaml
View File

@ -107,25 +107,18 @@ limitations under the License.
---
apiVersion: v1
kind: ConfigMap
kind: Secret
metadata:
name: ceilometer-etc
type: Opaque
data:
rally_tests.yaml: |
{{ toYaml .Values.conf.rally_tests | indent 4 }}
ceilometer.conf: |
{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.ceilometer | indent 4 }}
api_paste.ini: |
{{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }}
policy.json: |
{{ toJson .Values.conf.policy | indent 4 }}
event_pipeline.yaml: |
{{ toYaml .Values.conf.event_pipeline | indent 4 }}
pipeline.yaml: |
{{ toYaml .Values.conf.pipeline | indent 4 }}
event_definitions.yaml: |
{{ toYaml .Values.conf.event_definitions | indent 4 }}
gnocchi_resources.yaml: |
{{ toYaml .Values.conf.gnocchi_resources | indent 4 }}
{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.wsgi_ceilometer "key" "wsgi-ceilometer.conf" ) | indent 2 }}
rally_tests.yaml: {{ toYaml .Values.conf.rally_tests | b64enc }}
ceilometer.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.ceilometer | b64enc }}
api_paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | b64enc }}
policy.json: {{ toJson .Values.conf.policy | b64enc }}
event_pipeline.yaml: {{ toYaml .Values.conf.event_pipeline | b64enc }}
pipeline.yaml: {{ toYaml .Values.conf.pipeline | b64enc }}
event_definitions.yaml: {{ toYaml .Values.conf.event_definitions | b64enc }}
gnocchi_resources.yaml: {{ toYaml .Values.conf.gnocchi_resources | b64enc }}
{{ include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.wsgi_ceilometer "key" "wsgi-ceilometer.conf" "format" "Secret" ) | indent 2 }}
{{- end }}

4
ceilometer/templates/daemonset-compute.yaml
View File

@ -109,8 +109,8 @@ spec:
- name: pod-etc-ceilometer
emptyDir: {}
- name: ceilometer-etc
configMap:
name: ceilometer-etc
secret:
secretName: ceilometer-etc
defaultMode: 0444
- name: ceilometer-bin
configMap:

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

@ -114,8 +114,8 @@ spec:
- name: pod-etc-ceilometer
emptyDir: {}
- name: ceilometer-etc
configMap:
name: ceilometer-etc
secret:
secretName: ceilometer-etc
defaultMode: 0444
- name: ceilometer-bin
configMap:

4
ceilometer/templates/deployment-central.yaml
View File

@ -96,8 +96,8 @@ spec:
- name: pod-etc-ceilometer
emptyDir: {}
- name: ceilometer-etc
configMap:
name: ceilometer-etc
secret:
secretName: ceilometer-etc
defaultMode: 0444
- name: ceilometer-bin
configMap:

4
ceilometer/templates/deployment-collector.yaml
View File

@ -96,8 +96,8 @@ spec:
- name: pod-etc-ceilometer
emptyDir: {}
- name: ceilometer-etc
configMap:
name: ceilometer-etc
secret:
secretName: ceilometer-etc
defaultMode: 0444
- name: ceilometer-bin
configMap:

4
ceilometer/templates/deployment-notification.yaml
View File

@ -96,8 +96,8 @@ spec:
- name: pod-etc-ceilometer
emptyDir: {}
- name: ceilometer-etc
configMap:
name: ceilometer-etc
secret:
secretName: ceilometer-etc
defaultMode: 0444
- name: ceilometer-bin
configMap:

4
ceilometer/templates/pod-rally-test.yaml
View File

@ -86,8 +86,8 @@ spec:
{{ if $mounts_tests.volumeMounts }}{{ toYaml $mounts_tests.volumeMounts | indent 8 }}{{ end }}
volumes:
- name: ceilometer-etc
configMap:
name: ceilometer-etc
secret:
secretName: ceilometer-etc
defaultMode: 0444
- name: ceilometer-bin
configMap:

33
cinder/templates/configmap-etc.yaml
View File

@ -108,33 +108,24 @@ limitations under the License.
{{- end -}}
---
apiVersion: v1
kind: ConfigMap
kind: Secret
metadata:
name: cinder-etc
type: Opaque
data:
rally_tests.yaml: |
{{ toYaml .Values.conf.rally_tests.tests | indent 4 }}
cinder.conf: |
{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.cinder | indent 4 }}
logging.conf: |
{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | indent 4 }}
backends.conf: |
{{ include "helm-toolkit.utils.to_ini" .Values.conf.backends | indent 4 }}
api-paste.ini: |
{{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }}
policy.json: |
{{ toJson .Values.conf.policy | indent 4 }}
cinder_sudoers: |
{{ $envAll.Values.conf.cinder_sudoers | indent 4 }}
rootwrap.conf: |
{{ $envAll.Values.conf.rootwrap | indent 4 }}
rally_tests.yaml: {{ toYaml .Values.conf.rally_tests.tests | b64enc }}
cinder.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.cinder | b64enc }}
logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | b64enc }}
backends.conf: {{ include "helm-toolkit.utils.to_ini" .Values.conf.backends | b64enc }}
api-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | b64enc }}
policy.json: {{ toJson .Values.conf.policy | b64enc }}
cinder_sudoers: {{ $envAll.Values.conf.cinder_sudoers | b64enc }}
rootwrap.conf: {{ $envAll.Values.conf.rootwrap | b64enc }}
{{- range $key, $value := $envAll.Values.conf.rootwrap_filters }}
{{- $filePrefix := replace "_" "-" $key }}
{{ printf "%s.filters" $filePrefix }}: |
{{ $value.content | indent 4 }}
{{ printf "%s.filters" $filePrefix }}: {{ $value.content | b64enc }}
{{- end }}
{{- if .Values.backup.external_ceph_rbd.enabled }}
external-backup-ceph.conf: |
{{ include "helm-toolkit.utils.to_ini" .Values.backup.external_ceph_rbd.conf | indent 4 }}
external-backup-ceph.conf: {{ include "helm-toolkit.utils.to_ini" .Values.backup.external_ceph_rbd.conf | b64enc }}
{{- end }}
{{- end }}

4
cinder/templates/cron-job-cinder-volume-usage-audit.yaml
View File

@ -71,8 +71,8 @@ spec:
- name: etccinder
emptyDir: {}
- name: cinder-etc
configMap:
name: cinder-etc
secret:
secretName: cinder-etc
defaultMode: 0444
- name: cinder-bin
configMap:

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

@ -118,8 +118,8 @@ spec:
name: cinder-bin
defaultMode: 0555
- name: cinder-etc
configMap:
name: cinder-etc
secret:
secretName: cinder-etc
defaultMode: 0444
{{- if eq ( split "://" .Values.conf.cinder.coordination.backend_url )._0 "file" }}
#NOTE (portdirect): this will need to be set to a shared mount amongst all cinder

4
cinder/templates/deployment-backup.yaml
View File

@ -195,8 +195,8 @@ spec:
{{ if $mounts_cinder_backup.volumeMounts }}{{ toYaml $mounts_cinder_backup.volumeMounts | indent 12 }}{{ end }}
volumes:
- name: cinder-etc
configMap:
name: cinder-etc
secret:
secretName: cinder-etc
defaultMode: 0444
- name: cinder-bin
configMap:

4
cinder/templates/deployment-scheduler.yaml
View File

@ -104,8 +104,8 @@ spec:
name: cinder-bin
defaultMode: 0555
- name: cinder-etc
configMap:
name: cinder-etc
secret:
secretName: cinder-etc
defaultMode: 0444
{{- if eq ( split "://" .Values.conf.cinder.coordination.backend_url )._0 "file" }}
#NOTE (portdirect): this will need to be set to a shared mount amongst all cinder

5
cinder/templates/deployment-volume.yaml
View File

@ -159,8 +159,9 @@ spec:
name: cinder-bin
defaultMode: 0555
- name: cinder-etc
configMap:
name: cinder-etc
secret:
secretName: cinder-etc
defaultMode: 0444
{{- if include "cinder.utils.is_ceph_volume_configured" $envAll }}
- name: etcceph
emptyDir: {}

4
cinder/templates/job-backup-storage-init.yaml
View File

@ -159,8 +159,8 @@ spec:
defaultMode: 0444
{{- if .Values.backup.external_ceph_rbd.enabled }}
- name: cinder-etc
configMap:
name: cinder-etc
secret:
secretName: cinder-etc
defaultMode: 0444
{{- end }}
{{- if empty .Values.conf.ceph.admin_keyring }}

4
cinder/templates/pod-rally-test.yaml
View File

@ -88,8 +88,8 @@ spec:
{{ if $mounts_tests.volumeMounts }}{{ toYaml $mounts_tests.volumeMounts | indent 8 }}{{ end }}
volumes:
- name: cinder-etc
configMap:
name: cinder-etc
secret:
secretName: cinder-etc
defaultMode: 0444
- name: cinder-bin
configMap:

15
congress/templates/configmap-etc.yaml
View File

@ -77,16 +77,13 @@ limitations under the License.
{{- end -}}
---
apiVersion: v1
kind: ConfigMap
kind: Secret
metadata:
name: congress-etc
type: Opaque
data:
congress.conf: |
{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.congress | indent 4 }}
logging.conf: |
{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | indent 4 }}
api-paste.ini: |
{{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }}
policy.json: |
{{ toJson .Values.conf.policy | indent 4 }}
congress.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.congress | b64enc }}
logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | b64enc }}
api-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | b64enc }}
policy.json: {{ toJson .Values.conf.policy | b64enc }}
{{- end }}

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

@ -89,7 +89,7 @@ spec:
name: congress-bin
defaultMode: 0777
- name: congress-etc
configMap:
name: congress-etc
secret:
secretName: congress-etc
defaultMode: 0444
{{ end }}

4
congress/templates/deployment-datasource.yaml
View File

@ -83,8 +83,8 @@ spec:
name: congress-bin
defaultMode: 0555
- name: congress-etc
configMap:
name: congress-etc
secret:
secretName: congress-etc
defaultMode: 0444
{{ end }}

4
congress/templates/deployment-policy-engine.yaml
View File

@ -83,8 +83,8 @@ spec:
name: congress-bin
defaultMode: 0555
- name: congress-etc
configMap:
name: congress-etc
secret:
secretName: congress-etc
defaultMode: 0444
{{ end }}

26
glance/templates/configmap-etc.yaml
View File

@ -158,23 +158,17 @@ limitations under the License.
{{- end -}}
---
apiVersion: v1
kind: ConfigMap
kind: Secret
metadata:
name: glance-etc
type: Opaque
data:
rally_tests.yaml: |
{{ toYaml .Values.conf.rally_tests.tests | indent 4 }}
glance-api.conf: |
{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.glance | indent 4 }}
logging.conf: |
{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | indent 4 }}
glance-api-paste.ini: |
{{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }}
glance-registry.conf: |
{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.glance_registry | indent 4 }}
glance-registry-paste.ini: |
{{ include "helm-toolkit.utils.to_ini" .Values.conf.paste_registry | indent 4 }}
policy.json: |
{{ toJson .Values.conf.policy | indent 4 }}
{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.swift_store "key" "swift-store.conf") | indent 2 }}
rally_tests.yaml: {{ toYaml .Values.conf.rally_tests.tests | b64enc }}
glance-api.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.glance | b64enc }}
logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | b64enc }}
glance-api-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | b64enc }}
glance-registry.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.glance_registry | b64enc }}
glance-registry-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste_registry | b64enc }}
policy.json: {{ toJson .Values.conf.policy | b64enc }}
{{- include "helm-toolkit.snippets.values_template_renderer" ( dict "envAll" $envAll "template" .Values.conf.swift_store "key" "swift-store.conf" "format" "Secret" ) | indent 2 }}
{{- end }}

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

@ -157,8 +157,8 @@ spec:
name: glance-bin
defaultMode: 0555
- name: glance-etc
configMap:
name: glance-etc
secret:
secretName: glance-etc
defaultMode: 0444
{{- if eq .Values.storage "pvc" }}
- name: glance-images

4
glance/templates/deployment-registry.yaml
View File

@ -104,8 +104,8 @@ spec:
name: glance-bin
defaultMode: 0555
- name: glance-etc
configMap:
name: glance-etc
secret:
secretName: glance-etc
defaultMode: 0444
{{ if $mounts_glance_registry.volumes }}{{ toYaml $mounts_glance_registry.volumes | indent 8 }}{{ end }}
{{- end }}

4
glance/templates/pod-rally-test.yaml
View File

@ -88,8 +88,8 @@ spec:
{{ if $mounts_tests.volumeMounts }}{{ toYaml $mounts_tests.volumeMounts | indent 8 }}{{ end }}
volumes:
- name: glance-etc
configMap:
name: glance-etc
secret:
secretName: glance-etc
defaultMode: 0444
- name: glance-bin
configMap:

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

@ -85,15 +85,13 @@ limitations under the License.
{{- $envAll := . }}
---
apiVersion: v1
kind: ConfigMap
kind: Secret
metadata:
name: gnocchi-etc
type: Opaque
data:
gnocchi.conf: |
{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.gnocchi | indent 4 }}
api-paste.ini: |
{{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }}
policy.json: |
{{ toJson .Values.conf.policy | indent 4 }}
{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.apache "key" "wsgi-gnocchi.conf") | indent 2 }}
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 }}
policy.json: {{ toJson .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 }}
{{- end }}

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

@ -98,8 +98,8 @@ spec:
- name: pod-etc-gnocchi
emptyDir: {}
- name: gnocchi-etc
configMap:
name: gnocchi-etc
secret:
secretName: gnocchi-etc
defaultMode: 0444
- name: gnocchi-bin
configMap:

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

@ -104,8 +104,8 @@ spec:
- name: pod-etc-gnocchi
emptyDir: {}
- name: gnocchi-etc
configMap:
name: gnocchi-etc
secret:
secretName: gnocchi-etc
defaultMode: 0444
- name: gnocchi-bin
configMap:

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

@ -123,8 +123,8 @@ spec:
- name: pod-etc-gnocchi
emptyDir: {}
- name: gnocchi-etc
configMap:
name: gnocchi-etc
secret:
secretName: gnocchi-etc
defaultMode: 0444
- name: gnocchi-bin
configMap:

4
gnocchi/templates/job-db-init-indexer.yaml
View File

@ -66,8 +66,8 @@ spec:
readOnly: true
volumes:
- name: gnocchi-etc
configMap:
name: gnocchi-etc
secret:
secretName: gnocchi-etc
defaultMode: 0444
- name: pod-etc-gnocchi
emptyDir: {}

4
gnocchi/templates/job-db-sync.yaml
View File

@ -76,8 +76,8 @@ spec:
readOnly: true
volumes:
- name: gnocchi-etc
configMap:
name: gnocchi-etc
secret:
secretName: gnocchi-etc
defaultMode: 0444
- name: gnocchi-bin
configMap:

4
gnocchi/templates/pod-gnocchi-test.yaml
View File

@ -70,8 +70,8 @@ spec:
{{ if $mounts_gnocchi_tests.volumeMounts }}{{ toYaml $mounts_gnocchi_tests.volumeMounts | indent 8 }}{{ end }}
volumes:
- name: gnocchi-etc
configMap:
name: gnocchi-etc
secret:
secretName: gnocchi-etc
defaultMode: 0444
- name: gnocchi-bin
configMap:

21
heat/templates/configmap-etc.yaml
View File

@ -134,22 +134,17 @@ limitations under the License.
{{- end -}}
---
apiVersion: v1
kind: ConfigMap
kind: Secret
metadata:
name: heat-etc
type: Opaque
data:
rally_tests.yaml: |
{{ toYaml .Values.conf.rally_tests.tests | indent 4 }}
heat.conf: |
{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.heat | indent 4 }}
logging.conf: |
{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | indent 4 }}
api-paste.ini: |
{{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }}
policy.json: |
{{ toJson .Values.conf.policy | indent 4 }}
rally_tests.yaml: {{ toYaml .Values.conf.rally_tests.tests | b64enc }}
heat.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.heat | b64enc }}
logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | b64enc }}
api-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | b64enc }}
policy.json: {{ toJson .Values.conf.policy | b64enc }}
{{- range $key, $value := $envAll.Values.conf.rally_tests.templates }}
{{ printf "test_template_%d" $key }}: |
{{ $value.template | indent 4 }}
{{ printf "test_template_%d" $key }}: {{ $value.template | b64enc }}
{{- end }}
{{- end }}

4
heat/templates/cron-job-engine-cleaner.yaml
View File

@ -71,8 +71,8 @@ spec:
- name: etcheat
emptyDir: {}
- name: heat-etc
configMap:
name: heat-etc
secret:
secretName: heat-etc
defaultMode: 0444
- name: heat-bin
configMap:

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

@ -104,8 +104,8 @@ spec:
name: heat-bin
defaultMode: 0555
- name: heat-etc
configMap:
name: heat-etc
secret:
secretName: heat-etc
defaultMode: 0444
{{ if $mounts_heat_api.volumes }}{{ toYaml $mounts_heat_api.volumes | indent 8 }}{{ end }}
{{- end }}

4
heat/templates/deployment-cfn.yaml
View File

@ -104,8 +104,8 @@ spec:
name: heat-bin
defaultMode: 0555
- name: heat-etc
configMap:
name: heat-etc
secret:
secretName: heat-etc
defaultMode: 0444
{{ if $mounts_heat_cfn.volumes }}{{ toYaml $mounts_heat_cfn.volumes | indent 8 }}{{ end }}
{{- end }}

4
heat/templates/deployment-cloudwatch.yaml
View File

@ -104,8 +104,8 @@ spec:
name: heat-bin
defaultMode: 0555
- name: heat-etc
configMap:
name: heat-etc
secret:
secretName: heat-etc
defaultMode: 0444
{{ if $mounts_heat_cloudwatch.volumes }}{{ toYaml $mounts_heat_cloudwatch.volumes | indent 8 }}{{ end }}
{{- end }}

4
heat/templates/deployment-engine.yaml
View File

@ -102,8 +102,8 @@ spec:
name: heat-bin
defaultMode: 0555
- name: heat-etc
configMap:
name: heat-etc
secret:
secretName: heat-etc
defaultMode: 0444
{{ if $mounts_heat_engine.volumes }}{{ toYaml $mounts_heat_engine.volumes | indent 8 }}{{ end }}
{{- end }}

4
heat/templates/pod-rally-test.yaml
View File

@ -94,8 +94,8 @@ spec:
{{ if $mounts_tests.volumeMounts }}{{ toYaml $mounts_tests.volumeMounts | indent 8 }}{{ end }}
volumes:
- name: heat-etc
configMap:
name: heat-etc
secret:
secretName: heat-etc
defaultMode: 0444
- name: heat-bin
configMap:

10
horizon/templates/configmap-etc.yaml
View File

@ -18,14 +18,14 @@ limitations under the License.
{{- $envAll := . }}
---
apiVersion: v1
kind: ConfigMap
kind: Secret
metadata:
name: horizon-etc
type: Opaque
data:
{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.horizon.apache "key" "horizon.conf") | indent 2 }}
{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.horizon.local_settings.template "key" "local_settings") | indent 2 }}
{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.horizon.apache "key" "horizon.conf" "format" "Secret" ) | indent 2 }}
{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.horizon.local_settings.template "key" "local_settings" "format" "Secret" ) | indent 2 }}
{{- range $key, $value := .Values.conf.horizon.policy }}
{{ printf "%s_policy.json" $key }}: |
{{ $value | toPrettyJson | indent 4 }}
{{ printf "%s_policy.json" $key }}: {{ $value | toPrettyJson | b64enc }}
{{- end }}
{{- end }}

4
horizon/templates/deployment.yaml
View File

@ -117,8 +117,8 @@ spec:
name: horizon-bin
defaultMode: 0555
- name: horizon-etc
configMap:
name: horizon-etc
secret:
secretName: horizon-etc
defaultMode: 0444
{{ if $mounts_horizon.volumes }}{{ toYaml $mounts_horizon.volumes | indent 8 }}{{ end }}
{{- end }}

4
horizon/templates/job-db-sync.yaml
View File

@ -61,8 +61,8 @@ spec:
{{ if $mounts_horizon_db_sync.volumeMounts }}{{ toYaml $mounts_horizon_db_sync.volumeMounts | indent 10 }}{{ end }}
volumes:
- name: horizon-etc
configMap:
name: horizon-etc
secret:
secretName: horizon-etc
defaultMode: 0444
- name: horizon-bin
configMap:

16
ironic/templates/configmap-etc.yaml
View File

@ -198,16 +198,14 @@ limitations under the License.
{{- end -}}
---
apiVersion: v1
kind: ConfigMap
kind: Secret
metadata:
name: ironic-etc
type: Opaque
data:
ironic.conf: |
{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.ironic | indent 4 }}
logging.conf: |
{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | indent 4 }}
policy.json: |
{{ toJson .Values.conf.policy | indent 4 }}
{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.tftp_map_file "key" "tftp-map-file") | indent 2 }}
{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.nginx "key" "nginx.conf") | indent 2 }}
ironic.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.ironic | b64enc }}
logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | b64enc }}
policy.json: {{ toJson .Values.conf.policy | b64enc }}
{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.tftp_map_file "key" "tftp-map-file" "format" "Secret" ) | indent 2 }}
{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.nginx "key" "nginx.conf" "format" "Secret" ) | indent 2 }}
{{- end }}

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

@ -130,8 +130,8 @@ spec:
name: ironic-bin
defaultMode: 0555
- name: ironic-etc
configMap:
name: ironic-etc
secret:
secretName: ironic-etc
defaultMode: 0444
- name: pod-shared
emptyDir: {}

4
ironic/templates/statefulset-conductor.yaml
View File

@ -219,8 +219,8 @@ spec:
name: ironic-bin
defaultMode: 0555
- name: ironic-etc
configMap:
name: ironic-etc
secret:
secretName: ironic-etc
defaultMode: 0444
- name: host-var-lib-ironic
hostPath:

29
keystone/templates/configmap-etc.yaml
View File

@ -43,26 +43,21 @@ limitations under the License.
{{- end -}}
---
apiVersion: v1
kind: ConfigMap
kind: Secret
metadata:
name: keystone-etc
type: Opaque
data:
rally_tests.yaml: |
{{ toYaml .Values.conf.rally_tests.tests | indent 4 }}
keystone.conf: |
{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.keystone | indent 4 }}
logging.conf: |
{{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.logging | indent 4 }}
keystone-paste.ini: |
{{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }}
policy.json: |
{{ toJson .Values.conf.policy | indent 4 }}
ports.conf: ""
rally_tests.yaml: {{ toYaml .Values.conf.rally_tests.tests | b64enc }}
keystone.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.keystone | b64enc }}
logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.logging | b64enc }}
keystone-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | b64enc }}
policy.json: {{ toJson .Values.conf.policy | b64enc }}
ports.conf: ''
{{- range $k, $v := .Values.conf.ks_domains }}
keystone.{{ $k }}.json: |
{{ toJson $v | indent 4 }}
keystone.{{ $k }}.json: {{ toJson $v | b64enc }}
{{- end }}
{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.mpm_event "key" "mpm_event.conf") | indent 2 }}
{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.wsgi_keystone "key" "wsgi-keystone.conf") | indent 2 }}
{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.sso_callback_template "key" "sso_callback_template.html") | indent 2 }}
{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.mpm_event "key" "mpm_event.conf" "format" "Secret" ) | indent 2 }}
{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.wsgi_keystone "key" "wsgi-keystone.conf" "format" "Secret" ) | indent 2 }}
{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.sso_callback_template "key" "sso_callback_template.html" "format" "Secret" ) | indent 2 }}
{{- end }}

4
keystone/templates/cron-job-credential-rotate.yaml
View File

@ -112,8 +112,8 @@ spec:
- name: etckeystone
emptyDir: {}
- name: keystone-etc
configMap:
name: keystone-etc
secret:
secretName: keystone-etc
defaultMode: 0444
- name: keystone-bin
configMap:

4
keystone/templates/cron-job-fernet-rotate.yaml
View File

@ -111,8 +111,8 @@ spec:
- name: etckeystone
emptyDir: {}
- name: keystone-etc
configMap:
name: keystone-etc
secret:
secretName: keystone-etc
defaultMode: 0444
- name: keystone-bin
configMap:

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

@ -145,8 +145,8 @@ spec:
- name: run-apache
emptyDir: {}
- name: keystone-etc
configMap:
name: keystone-etc
secret:
secretName: keystone-etc
defaultMode: 0444
- name: keystone-bin
configMap:

8
keystone/templates/job-credential-setup.yaml
View File

@ -87,6 +87,8 @@ spec:
volumeMounts:
- name: etckeystone
mountPath: /etc/keystone
- name: credential-keys
mountPath: {{ .Values.conf.keystone.credential.key_repository | quote }}
- name: keystone-etc
mountPath: /etc/keystone/keystone.conf
subPath: keystone.conf
@ -103,9 +105,11 @@ spec:
volumes:
- name: etckeystone
emptyDir: {}
- name: credential-keys
emptyDir: {}
- name: keystone-etc
configMap:
name: keystone-etc
secret:
secretName: keystone-etc
defaultMode: 0444
- name: keystone-bin
configMap:

4
keystone/templates/job-domain-manage.yaml
View File

@ -103,8 +103,8 @@ spec:
- name: etckeystonedomains
emptyDir: {}
- name: keystone-etc
configMap:
name: keystone-etc
secret:
secretName: keystone-etc
defaultMode: 0444
- name: keystone-bin
configMap:

8
keystone/templates/job-fernet-setup.yaml
View File

@ -88,6 +88,8 @@ spec:
volumeMounts:
- name: etckeystone
mountPath: /etc/keystone
- name: fernet-keys
mountPath: {{ .Values.conf.keystone.fernet_tokens.key_repository | quote }}
- name: keystone-etc
mountPath: /etc/keystone/keystone.conf
subPath: keystone.conf
@ -104,9 +106,11 @@ spec:
volumes:
- name: etckeystone
emptyDir: {}
- name: fernet-keys
emptyDir: {}
- name: keystone-etc
configMap:
name: keystone-etc
secret:
secretName: keystone-etc
defaultMode: 0444
- name: keystone-bin
configMap:

4
keystone/templates/pod-rally-test.yaml
View File

@ -86,8 +86,8 @@ spec:
{{ if $mounts_tests.volumeMounts }}{{ toYaml $mounts_tests.volumeMounts | indent 8 }}{{ end }}
volumes:
- name: keystone-etc
configMap:
name: keystone-etc
secret:
secretName: keystone-etc
defaultMode: 0444
- name: keystone-bin
configMap:

15
magnum/templates/configmap-etc.yaml
View File

@ -87,16 +87,13 @@ limitations under the License.
{{- end -}}
---
apiVersion: v1
kind: ConfigMap
kind: Secret
metadata:
name: magnum-etc
type: Opaque
data:
magnum.conf: |
{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.magnum | indent 4 }}
logging.conf: |
{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | indent 4 }}
api-paste.ini: |
{{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }}
policy.json: |
{{ toJson .Values.conf.policy | indent 4 }}
magnum.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.magnum | b64enc }}
logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | b64enc }}
api-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | b64enc }}
policy.json: {{ toJson .Values.conf.policy | b64enc }}
{{- end }}

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

@ -114,8 +114,8 @@ spec:
name: magnum-bin
defaultMode: 0555
- name: magnum-etc
configMap:
name: magnum-etc
secret:
secretName: magnum-etc
defaultMode: 0444
- name: magnum-lock-path
emptyDir: {}

4
magnum/templates/statefulset-conductor.yaml
View File

@ -109,8 +109,8 @@ spec:
name: magnum-bin
defaultMode: 0555
- name: magnum-etc
configMap:
name: magnum-etc
secret:
secretName: magnum-etc
defaultMode: 0444
- name: magnum-lock-path
emptyDir: {}

18
mistral/templates/configmap-etc.yaml
View File

@ -77,20 +77,16 @@ limitations under the License.
{{- end -}}
---
apiVersion: v1
kind: ConfigMap
kind: Secret
metadata:
name: mistral-etc
type: Opaque
data:
rally_tests.yaml: |
{{ toYaml .Values.conf.rally_tests.tests | indent 4 }}
mistral.conf: |
{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.mistral | indent 4 }}
logging.conf: |
{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | indent 4 }}
policy.json: |
{{ toJson .Values.conf.policy | indent 4 }}
rally_tests.yaml: {{ toYaml .Values.conf.rally_tests.tests | b64enc }}
mistral.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.mistral | b64enc }}
logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | b64enc }}
policy.json: {{ toJson .Values.conf.policy | b64enc }}
{{- range $key, $value := $envAll.Values.conf.rally_tests.templates }}
{{ printf "test_template_%d" $key }}: |
{{ $value.template | indent 4 }}
{{ printf "test_template_%d" $key }}: {{ $value.template | b64enc }}
{{- end }}
{{- end }}

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

@ -100,8 +100,8 @@ spec:
name: mistral-bin
defaultMode: 0555
- name: mistral-etc
configMap:
name: mistral-etc
secret:
secretName: mistral-etc
defaultMode: 0444
{{ if $mounts_mistral_api.volumes }}{{ toYaml $mounts_mistral_api.volumes | indent 8 }}{{ end }}
{{- end }}

4
mistral/templates/deployment-executor.yaml
View File

@ -82,8 +82,8 @@ spec:
name: mistral-bin
defaultMode: 0555
- name: mistral-etc
configMap:
name: mistral-etc
secret:
secretName: mistral-etc
defaultMode: 0444
{{ if $mounts_mistral_executor.volumes }}{{ toYaml $mounts_mistral_executor.volumes | indent 8 }}{{ end }}
{{- end }}

4
mistral/templates/pod-rally-test.yaml
View File

@ -94,8 +94,8 @@ spec:
{{ if $mounts_tests.volumeMounts }}{{ toYaml $mounts_tests.volumeMounts | indent 8 }}{{ end }}
volumes:
- name: mistral-etc
configMap:
name: mistral-etc
secret:
secretName: mistral-etc
defaultMode: 0444
- name: mistral-bin
configMap:

4
mistral/templates/statefulset-engine.yaml
View File

@ -79,8 +79,8 @@ spec:
name: mistral-bin
defaultMode: 0555
- name: mistral-etc
configMap:
name: mistral-etc
secret:
secretName: mistral-etc
defaultMode: 0444
{{ if $mounts_mistral_engine.volumes }}{{ toYaml $mounts_mistral_engine.volumes | indent 8 }}{{ end }}
{{- end }}

4
mistral/templates/statefulset-event-engine.yaml
View File

@ -79,8 +79,8 @@ spec:
name: mistral-bin
defaultMode: 0555
- name: mistral-etc
configMap:
name: mistral-etc
secret:
secretName: mistral-etc
defaultMode: 0444
{{ if $mounts_mistral_event_engine.volumes }}{{ toYaml $mounts_mistral_event_engine.volumes | indent 8 }}{{ end }}
{{- end }}

2
mistral/values.yaml
View File

@ -459,7 +459,7 @@ conf:
port: null
api_workers: 8
coordination:
backend_url: null
backend_url: ""
database:
max_retries: -1
keystone_authtoken:

57
neutron/templates/configmap-etc.yaml
View File

@ -171,49 +171,32 @@ just set it along with nova_metadata_host.
{{- end -}}
---
apiVersion: v1
kind: ConfigMap
kind: Secret
metadata:
name: {{ $configMapName }}
type: Opaque
data:
rally_tests.yaml: |
{{ toYaml $envAll.Values.conf.rally_tests.tests | indent 4 }}
api-paste.ini: |
{{ include "helm-toolkit.utils.to_ini" $envAll.Values.conf.paste | indent 4 }}
policy.json: |
{{ toJson $envAll.Values.conf.policy | indent 4 }}
neutron.conf: |
{{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.neutron | indent 4 }}
logging.conf: |
{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | indent 4 }}
dhcp_agent.ini: |
{{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.dhcp_agent | indent 4 }}
l3_agent.ini: |
{{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.l3_agent | indent 4 }}
metadata_agent.ini: |
{{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.metadata_agent | indent 4 }}
metering_agent.ini: |
{{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.metering_agent | indent 4 }}
ml2_conf.ini: |
{{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.ml2_conf | indent 4 }}
ml2_conf_sriov.ini: |
{{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.ml2_conf_sriov | indent 4 }}
macvtap_agent.ini: |
{{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.macvtap_agent | indent 4 }}
linuxbridge_agent.ini: |
{{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.linuxbridge_agent | indent 4 }}
openvswitch_agent.ini: |
{{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.openvswitch_agent | indent 4 }}
sriov_agent.ini: |
{{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.sriov_agent | indent 4 }}
rally_tests.yaml: {{ toYaml $envAll.Values.conf.rally_tests.tests | b64enc }}
api-paste.ini: {{ include "helm-toolkit.utils.to_ini" $envAll.Values.conf.paste | b64enc }}
policy.json: {{ toJson $envAll.Values.conf.policy | b64enc }}
neutron.conf: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.neutron | b64enc }}
logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | b64enc }}
dhcp_agent.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.dhcp_agent | b64enc }}
l3_agent.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.l3_agent | b64enc }}
metadata_agent.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.metadata_agent | b64enc }}
metering_agent.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.metering_agent | b64enc }}
ml2_conf.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.ml2_conf | b64enc }}
ml2_conf_sriov.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.ml2_conf_sriov | b64enc }}
macvtap_agent.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.macvtap_agent | b64enc }}
linuxbridge_agent.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.linuxbridge_agent | b64enc }}
openvswitch_agent.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.openvswitch_agent | b64enc }}
sriov_agent.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.sriov_agent | b64enc }}
dnsmasq.conf: ""
neutron_sudoers: |
{{ $envAll.Values.conf.neutron_sudoers | indent 4 }}
rootwrap.conf: |
{{ $envAll.Values.conf.rootwrap | indent 4 }}
neutron_sudoers: {{ $envAll.Values.conf.neutron_sudoers | b64enc }}
rootwrap.conf: {{ $envAll.Values.conf.rootwrap | b64enc }}
{{- range $key, $value := $envAll.Values.conf.rootwrap_filters }}
{{- $filePrefix := replace "_" "-" $key }}
{{ printf "%s.filters" $filePrefix }}: |
{{ $value.content | indent 4 }}
{{ printf "%s.filters" $filePrefix }}: {{ $value.content | b64enc }}
{{- end }}
{{- end }}
{{- end }}

4
neutron/templates/daemonset-dhcp-agent.yaml
View File

@ -135,8 +135,8 @@ spec:
name: neutron-bin
defaultMode: 0555
- name: neutron-etc
configMap:
name: {{ $configMapName }}
secret:
secretName: {{ $configMapName }}
defaultMode: 0444
- name: socket
hostPath:

4
neutron/templates/daemonset-l3-agent.yaml
View File

@ -134,8 +134,8 @@ spec:
name: neutron-bin
defaultMode: 0555
- name: neutron-etc
configMap:
name: {{ $configMapName }}
secret:
secretName: {{ $configMapName }}
defaultMode: 0444
- name: libmodules
hostPath:

4
neutron/templates/daemonset-lb-agent.yaml
View File

@ -194,8 +194,8 @@ spec:
name: neutron-bin
defaultMode: 0555
- name: neutron-etc
configMap:
name: {{ $configMapName }}
secret:
secretName: {{ $configMapName }}
defaultMode: 0444
- name: run
hostPath:

4
neutron/templates/daemonset-metadata-agent.yaml
View File

@ -148,8 +148,8 @@ spec:
name: neutron-bin
defaultMode: 0555
- name: neutron-etc
configMap:
name: {{ $configMapName }}
secret:
secretName: {{ $configMapName }}
defaultMode: 0444
- name: socket
hostPath:

4
neutron/templates/daemonset-ovs-agent.yaml
View File

@ -198,8 +198,8 @@ spec:
name: neutron-bin
defaultMode: 0555
- name: neutron-etc
configMap:
name: {{ $configMapName }}
secret:
secretName: {{ $configMapName }}
defaultMode: 0444
- name: run
hostPath:

4
neutron/templates/daemonset-sriov-agent.yaml
View File

@ -171,8 +171,8 @@ spec:
name: neutron-bin
defaultMode: 0555
- name: neutron-etc
configMap:
name: {{ $configMapName }}
secret:
secretName: {{ $configMapName }}
defaultMode: 0444
- name: run
hostPath:

4
neutron/templates/deployment-server.yaml
View File

@ -113,8 +113,8 @@ spec:
name: neutron-bin
defaultMode: 0555
- name: neutron-etc
configMap:
name: neutron-etc
secret:
secretName: neutron-etc
defaultMode: 0444
{{ if $mounts_neutron_server.volumes }}{{ toYaml $mounts_neutron_server.volumes | indent 8 }}{{ end }}
{{- end }}

4
neutron/templates/pod-rally-test.yaml
View File

@ -88,8 +88,8 @@ spec:
{{ if $mounts_tests.volumeMounts }}{{ toYaml $mounts_tests.volumeMounts | indent 8 }}{{ end }}
volumes:
- name: neutron-etc
configMap:
name: neutron-etc
secret:
secretName: neutron-etc
defaultMode: 0444
- name: neutron-bin
configMap:

34
nova/templates/configmap-etc.yaml
View File

@ -214,34 +214,26 @@ limitations under the License.
{{- end -}}
---
apiVersion: v1
kind: ConfigMap
kind: Secret
metadata:
name: {{ $configMapName }}
type: Opaque
data:
rally_tests.yaml: |
{{ toYaml .Values.conf.rally_tests.tests | indent 4 }}
api-paste.ini: |
{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.paste | indent 4 }}
policy.yaml: |
{{ toYaml .Values.conf.policy | indent 4 }}
nova_sudoers: |
{{ $envAll.Values.conf.nova_sudoers | indent 4 }}
rootwrap.conf: |
{{- .Values.conf.rootwrap | indent 4 }}
rally_tests.yaml: {{ toYaml .Values.conf.rally_tests.tests | b64enc }}
api-paste.ini: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.paste | b64enc }}
policy.yaml: {{ toYaml .Values.conf.policy | b64enc }}
nova_sudoers: {{ $envAll.Values.conf.nova_sudoers | b64enc }}
rootwrap.conf: {{ .Values.conf.rootwrap | b64enc }}
{{- range $key, $value := $envAll.Values.conf.rootwrap_filters }}
{{- $filePrefix := replace "_" "-" $key }}
{{ printf "%s.filters" $filePrefix }}: |
{{ $value.content | indent 4 }}
{{ printf "%s.filters" $filePrefix }}: {{ $value.content | b64enc }}
{{- end }}
nova.conf: |
{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.nova | indent 4 }}
logging.conf: |
{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | indent 4 }}
nova-ironic.conf: |
{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.nova_ironic | indent 4 }}
{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.wsgi_placement "key" "wsgi-nova-placement.conf" ) | indent 2 }}
nova.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.nova | b64enc }}
logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | b64enc }}
nova-ironic.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.nova_ironic | b64enc }}
{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.wsgi_placement "key" "wsgi-nova-placement.conf" "format" "Secret" ) | indent 2 }}
# FIXME(portdirect): why is this file suffixed .sh?
{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.ssh "key" "ssh-config.sh" ) | indent 2 }}
{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.ssh "key" "ssh-config.sh" "format" "Secret" ) | indent 2 }}
{{- end }}
{{- end }}
{{- if .Values.manifests.configmap_etc }}

4
nova/templates/cron-job-cell-setup.yaml
View File

@ -74,8 +74,8 @@ spec:
- name: etcnova
emptyDir: {}
- name: nova-etc
configMap:
name: nova-etc
secret:
secretName: nova-etc
defaultMode: 0444
- name: nova-bin
configMap:

4
nova/templates/cron-job-service-cleaner.yaml
View File

@ -63,8 +63,8 @@ spec:
- name: etcnova
emptyDir: {}
- name: nova-etc
configMap:
name: nova-etc
secret:
secretName: nova-etc
defaultMode: 0444
- name: nova-bin
configMap:

4
nova/templates/daemonset-compute.yaml
View File

@ -290,8 +290,8 @@ spec:
name: nova-bin
defaultMode: 0555
- name: nova-etc
configMap:
name: {{ $configMapName }}
secret:
secretName: {{ $configMapName }}
defaultMode: 0444
{{- if .Values.conf.ceph.enabled }}
- name: etcceph

4
nova/templates/deployment-api-metadata.yaml
View File

@ -153,8 +153,8 @@ spec:
name: nova-bin
defaultMode: 0555
- name: nova-etc
configMap:
name: nova-etc
secret:
secretName: nova-etc
defaultMode: 0444
- name: pod-shared
emptyDir: {}

4
nova/templates/deployment-api-osapi.yaml
View File

@ -100,8 +100,8 @@ spec:
name: nova-bin
defaultMode: 0555
- name: nova-etc
configMap:
name: nova-etc
secret:
secretName: nova-etc
defaultMode: 0444
{{ if $mounts_nova_api_osapi.volumes}}{{ toYaml $mounts_nova_api_osapi.volumes | indent 8 }}{{ end }}
{{- end }}

4
nova/templates/deployment-conductor.yaml
View File

@ -82,8 +82,8 @@ spec:
name: nova-bin
defaultMode: 0555
- name: nova-etc
configMap:
name: nova-etc
secret:
secretName: nova-etc
defaultMode: 0444
{{ if $mounts_nova_conductor.volumes }}{{ toYaml $mounts_nova_conductor.volumes | indent 8 }}{{ end }}
{{- end }}

4
nova/templates/deployment-consoleauth.yaml
View File

@ -82,8 +82,8 @@ spec:
name: nova-bin
defaultMode: 0555
- name: nova-etc
configMap:
name: nova-etc
secret:
secretName: nova-etc
defaultMode: 0444
{{ if $mounts_nova_consoleauth.volumes }}{{ toYaml $mounts_nova_consoleauth.volumes | indent 8 }}{{ end }}
{{- end }}

4
nova/templates/deployment-novncproxy.yaml
View File

@ -120,8 +120,8 @@ spec:
name: nova-bin
defaultMode: 0555
- name: nova-etc
configMap:
name: nova-etc
secret:
secretName: nova-etc
defaultMode: 0444
- name: pod-usr-share-novnc
emptyDir: {}

4
nova/templates/deployment-placement.yaml
View File

@ -109,8 +109,8 @@ spec:
name: nova-bin
defaultMode: 0555
- name: nova-etc
configMap:
name: nova-etc
secret:
secretName: nova-etc
defaultMode: 0444
{{- if $mounts_nova_placement.volumes }}{{ toYaml $mounts_nova_placement.volumes | indent 8 }}{{ end }}
{{- end }}

4
nova/templates/deployment-scheduler.yaml
View File

@ -82,8 +82,8 @@ spec:
name: nova-bin
defaultMode: 0555
- name: nova-etc
configMap:
name: nova-etc
secret:
secretName: nova-etc
defaultMode: 0444
{{ if $mounts_nova_scheduler.volumes }}{{ toYaml $mounts_nova_scheduler.volumes | indent 8 }}{{ end }}
{{- end }}

4
nova/templates/deployment-spiceproxy.yaml
View File

@ -120,8 +120,8 @@ spec:
name: nova-bin
defaultMode: 0555
- name: nova-etc
configMap:
name: nova-etc
secret:
secretName: nova-etc
defaultMode: 0444
- name: pod-usr-share-spice-html5
emptyDir: {}

4
nova/templates/job-cell-setup.yaml
View File

@ -79,8 +79,8 @@ spec:
- name: etcnova
emptyDir: {}
- name: nova-etc
configMap:
name: nova-etc
secret:
secretName: nova-etc
defaultMode: 0444
- name: nova-bin
configMap:

4
nova/templates/pod-rally-test.yaml
View File

@ -88,8 +88,8 @@ spec:
{{ if $mounts_tests.volumeMounts }}{{ toYaml $mounts_tests.volumeMounts | indent 8 }}{{ end }}
volumes:
- name: nova-etc
configMap:
name: nova-etc
secret:
secretName: nova-etc
defaultMode: 0444
- name: nova-bin
configMap:

4
nova/templates/statefulset-compute-ironic.yaml
View File

@ -95,8 +95,8 @@ spec:
name: nova-bin
defaultMode: 0555
- name: nova-etc
configMap:
name: nova-etc
secret:
secretName: nova-etc
defaultMode: 0444
- name: varlibironic
hostPath:

6
rally/templates/configmap-etc.yaml
View File

@ -54,10 +54,10 @@ limitations under the License.
---
apiVersion: v1
kind: ConfigMap
kind: Secret
metadata:
name: rally-etc
type: Opaque
data:
rally.conf: |
{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.rally | indent 4 }}
rally.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.rally | b64enc }}
{{- end }}

4
rally/templates/job-manage-db.yaml
View File

@ -57,8 +57,8 @@ spec:
- name: etcrally
emptyDir: {}
- name: rally-etc
configMap:
name: rally-etc
secret:
secretName: rally-etc
defaultMode: 0444
- name: rally-bin
configMap:

4
rally/templates/job-run-task.yaml
View File

@ -84,8 +84,8 @@ spec:
- name: etcrally
emptyDir: {}
- name: rally-etc
configMap:
name: rally-etc
secret:
secretName: rally-etc
defaultMode: 0444
- name: rally-tasks
configMap:

18
senlin/templates/configmap-etc.yaml
View File

@ -97,18 +97,14 @@ limitations under the License.
{{- end -}}
---
apiVersion: v1
kind: ConfigMap
kind: Secret
metadata:
name: senlin-etc
type: Opaque
data:
rally_tests.yaml: |
{{ toYaml .Values.conf.rally_tests.tests | indent 4 }}
senlin.conf: |
{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.senlin | indent 4 }}
logging.conf: |
{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | indent 4 }}
api-paste.ini: |
{{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }}
policy.json: |
{{ toJson .Values.conf.policy | indent 4 }}
rally_tests.yaml: {{ toYaml .Values.conf.rally_tests.tests | b64enc }}
senlin.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.senlin | b64enc }}
logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | b64enc }}
api-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | b64enc }}
policy.json: {{ toJson .Values.conf.policy | b64enc }}
{{- end }}

4
senlin/templates/cron-job-engine-cleaner.yaml
View File

@ -74,8 +74,8 @@ spec:
- name: etcsenlin
emptyDir: {}
- name: senlin-etc
configMap:
name: senlin-etc
secret:
secretName: senlin-etc
defaultMode: 0444
- name: senlin-bin
configMap:

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

@ -112,8 +112,8 @@ spec:
name: senlin-bin
defaultMode: 0555
- name: senlin-etc
configMap:
name: senlin-etc
secret:
secretName: senlin-etc
defaultMode: 0444
{{ if $mounts_senlin_api.volumes }}{{ toYaml $mounts_senlin_api.volumes | indent 8 }}{{ end }}
{{- end }}

4
senlin/templates/deployment-engine.yaml
View File

@ -85,8 +85,8 @@ spec:
name: senlin-bin
defaultMode: 0555
- name: senlin-etc
configMap:
name: senlin-etc
secret:
secretName: senlin-etc
defaultMode: 0444
{{ if $mounts_senlin_engine.volumes }}{{ toYaml $mounts_senlin_engine.volumes | indent 8 }}{{ end }}
{{- end }}

12
tempest/templates/configmap-etc.yaml
View File

@ -43,18 +43,16 @@ limitations under the License.
---
apiVersion: v1
kind: ConfigMap
kind: Secret
metadata:
name: tempest-etc
type: Opaque
data:
tempest.conf: |+
{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.tempest | indent 4 }}
tempest.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.tempest | b64enc }}
{{ if not (empty .Values.conf.blacklist) }}
test-blacklist: |+
{{ include "tempest.utils.to_regex_file" .Values.conf.blacklist | indent 4 }}
test-blacklist: {{ include "tempest.utils.to_regex_file" .Values.conf.blacklist | b64enc }}
{{ end }}
{{ if not (empty .Values.conf.whitelist) }}
test-whitelist: |+
{{ include "tempest.utils.to_regex_file" .Values.conf.whitelist | indent 4 }}
test-whitelist: {{ include "tempest.utils.to_regex_file" .Values.conf.whitelist | b64enc }}
{{ end }}
{{- end }}

4
tempest/templates/job-run-tests.yaml
View File

@ -89,8 +89,8 @@ spec:
- name: etctempest
emptyDir: {}
- name: tempest-etc
configMap:
name: tempest-etc
secret:
secretName: tempest-etc
defaultMode: 0444
- name: tempest-bin
configMap: