Merge "Start nova sshd container only if enabled"

nova/templates/bin/_ssh-start.sh.tpl

@@ -33,7 +33,6 @@ if [[ $(stat -c %U:%G ~nova/.ssh) != "nova:nova" ]]; then
     chown nova: ~nova/.ssh
 fi
 
-{{- if .Values.network.sshd.enabled }}
 subnet_address="{{- .Values.network.sshd.from_subnet -}}"
 cat > /tmp/sshd_config_extend <<EOF
 
@@ -48,6 +47,5 @@ Match Address $subnet_address
 EOF
 cat /tmp/sshd_config_extend >> /etc/ssh/sshd_config
 rm /tmp/sshd_config_extend
-{{- end }}
 
 exec /usr/sbin/sshd -D -e -o Port=$SSH_PORT

nova/templates/daemonset-compute.yaml

@@ -312,6 +312,7 @@ spec:
               mountPath: /etc/machine-id
               readOnly: true
 {{ if $mounts_nova_compute.volumeMounts }}{{ toYaml $mounts_nova_compute.volumeMounts | indent 12 }}{{ end }}
+        {{- if .Values.network.sshd.enabled }}
         - name: nova-compute-ssh
 {{ tuple $envAll "nova_compute_ssh" | include "helm-toolkit.snippets.image" | indent 10 }}
 {{ tuple $envAll $envAll.Values.pod.resources.ssh | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
@@ -343,6 +344,7 @@ spec:
               mountPath: /tmp/ssh-start.sh
               subPath: ssh-start.sh
               readOnly: true
+        {{ end }}
       volumes:
         - name: pod-tmp
           emptyDir: {}