From 715f4bcfff367a0a3470a86430f8e4a0f2230dc5 Mon Sep 17 00:00:00 2001
From: Itxaka <igarcia@suse.com>
Date: Wed, 10 Apr 2019 11:56:26 +0200
Subject: [PATCH] Fix volumemounts indent issue

Using {{- if for the volume mounts caused them to be added inline with
the previous line.

Removing the - from the if expression makes them be properly aligned on
the next line

Change-Id: Ia5e28366fb1f2ae7420b7f5217c10cbb94bc48ab
---
 ironic/templates/deployment-api.yaml           | 4 ++--
 ironic/templates/statefulset-conductor.yaml    | 4 ++--
 nova/templates/deployment-placement.yaml       | 4 ++--
 nova/templates/statefulset-compute-ironic.yaml | 4 ++--
 rally/templates/job-bootstrap.yaml             | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ironic/templates/deployment-api.yaml b/ironic/templates/deployment-api.yaml
index 5ed71bbf4f..2f20d5d246 100644
--- a/ironic/templates/deployment-api.yaml
+++ b/ironic/templates/deployment-api.yaml
@@ -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 }}
diff --git a/ironic/templates/statefulset-conductor.yaml b/ironic/templates/statefulset-conductor.yaml
index cf6414e6c7..1fca3ea73d 100644
--- a/ironic/templates/statefulset-conductor.yaml
+++ b/ironic/templates/statefulset-conductor.yaml
@@ -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 }}
diff --git a/nova/templates/deployment-placement.yaml b/nova/templates/deployment-placement.yaml
index 5b34b85f31..70b37dc5e8 100644
--- a/nova/templates/deployment-placement.yaml
+++ b/nova/templates/deployment-placement.yaml
@@ -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 }}
diff --git a/nova/templates/statefulset-compute-ironic.yaml b/nova/templates/statefulset-compute-ironic.yaml
index e2c9fd7685..d9a5ebc570 100644
--- a/nova/templates/statefulset-compute-ironic.yaml
+++ b/nova/templates/statefulset-compute-ironic.yaml
@@ -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 }}
diff --git a/rally/templates/job-bootstrap.yaml b/rally/templates/job-bootstrap.yaml
index 7afee1db67..2c892c9dfd 100644
--- a/rally/templates/job-bootstrap.yaml
+++ b/rally/templates/job-bootstrap.yaml
@@ -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 }}