openstack
/
openstack-helm
Code Issues Proposed changes

Merge "Fix volumemounts indent issue"

This commit is contained in:
Zuul 2019-04-12 00:14:27 +00:00 committed by Gerrit Code Review
parent 2aae584b7d 715f4bcfff
commit 3d681fe7bb
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,7 +130,7 @@ spec:
readOnly: true
- name: pod-shared
mountPath: /tmp/pod-shared
{{- if $mounts_ironic_api.volumeMounts }}{{ toYaml $mounts_ironic_api.volumeMounts | indent 12 }}{{ end }}
{{ if $mounts_ironic_api.volumeMounts }}{{ toYaml $mounts_ironic_api.volumeMounts | indent 12 }}{{ end }}
volumes:
- name: ironic-bin
configMap:
@ -142,5 +142,5 @@ spec:
defaultMode: 0444
- name: pod-shared
emptyDir: {}
{{- if $mounts_ironic_api.volumes }}{{ toYaml $mounts_ironic_api.volumes | indent 8 }}{{ end }}
{{ if $mounts_ironic_api.volumes }}{{ toYaml $mounts_ironic_api.volumes | indent 8 }}{{ end }}
{{- end }}

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

@ -216,7 +216,7 @@ spec:
readOnly: true
- name: pod-data
mountPath: /var/lib/openstack-helm
{{- if $mounts_ironic_conductor.volumeMounts }}{{ toYaml $mounts_ironic_conductor.volumeMounts | indent 12 }}{{ end }}
{{ if $mounts_ironic_conductor.volumeMounts }}{{ toYaml $mounts_ironic_conductor.volumeMounts | indent 12 }}{{ end }}
volumes:
- name: pod-shared
emptyDir: {}
@ -244,5 +244,5 @@ spec:
path: /sys
- name: pod-data
emptyDir: {}
{{- if $mounts_ironic_conductor.volumes }}{{ toYaml $mounts_ironic_conductor.volumes | indent 8 }}{{ end }}
{{ if $mounts_ironic_conductor.volumes }}{{ toYaml $mounts_ironic_conductor.volumes | indent 8 }}{{ end }}
{{- end }}

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

@ -108,7 +108,7 @@ spec:
mountPath: /etc/apache2/conf-enabled/wsgi-nova-placement.conf
subPath: wsgi-nova-placement.conf
readOnly: true
{{- if $mounts_nova_placement.volumeMounts }}{{ toYaml $mounts_nova_placement.volumeMounts | indent 12 }}{{ end }}
{{ if $mounts_nova_placement.volumeMounts }}{{ toYaml $mounts_nova_placement.volumeMounts | indent 12 }}{{ end }}
volumes:
- name: wsgi-nova
emptyDir: {}
@ -120,5 +120,5 @@ spec:
secret:
secretName: nova-etc
defaultMode: 0444
{{- if $mounts_nova_placement.volumes }}{{ toYaml $mounts_nova_placement.volumes | indent 8 }}{{ end }}
{{ if $mounts_nova_placement.volumes }}{{ toYaml $mounts_nova_placement.volumes | indent 8 }}{{ end }}
{{- end }}

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

@ -93,7 +93,7 @@ spec:
readOnly: true
- name: varlibironic
mountPath: /var/lib/ironic
{{- if $mounts_nova_compute_ironic.volumeMounts }}{{ toYaml $mounts_nova_compute_ironic.volumeMounts | indent 12 }}{{ end }}
{{ if $mounts_nova_compute_ironic.volumeMounts }}{{ toYaml $mounts_nova_compute_ironic.volumeMounts | indent 12 }}{{ end }}
volumes:
- name: nova-bin
configMap:
@ -106,5 +106,5 @@ spec:
- name: varlibironic
hostPath:
path: /var/lib/ironic
{{- if $mounts_nova_compute_ironic.volumes }}{{ toYaml $mounts_nova_compute_ironic.volumes | indent 8 }}{{ end }}
{{ if $mounts_nova_compute_ironic.volumes }}{{ toYaml $mounts_nova_compute_ironic.volumes | indent 8 }}{{ end }}
{{- end }}

4
rally/templates/job-bootstrap.yaml
View File

@ -57,12 +57,12 @@ spec:
mountPath: /tmp/bootstrap.sh
subPath: bootstrap.sh
readOnly: true
{{- if $mounts_rally_bootstrap.volumeMounts }}{{ toYaml $mounts_rally_bootstrap.volumeMounts | indent 12 }}{{ end }}
{{ if $mounts_rally_bootstrap.volumeMounts }}{{ toYaml $mounts_rally_bootstrap.volumeMounts | indent 12 }}{{ end }}
volumes:
- name: rally-bin
configMap:
name: rally-bin
defaultMode: 0555
{{- if $mounts_rally_bootstrap.volumes }}{{ toYaml $mounts_rally_bootstrap.volumes | indent 8 }}{{ end }}
{{ if $mounts_rally_bootstrap.volumes }}{{ toYaml $mounts_rally_bootstrap.volumes | indent 8 }}{{ end }}
{{- end }}
{{- end }}