IP templating bug fix (#646)

* fix templating issue
suse-edge · Jan 28, 2025 · d95999c · d95999c
1 parent 41c6161
commit d95999c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/combustion/templates/k3s-multi-node-installer.sh.tpl b/pkg/combustion/templates/k3s-multi-node-installer.sh.tpl
@@ -100,11 +100,11 @@ echo "{{ .apiVIP6 }} {{ .apiHost }}" >> /etc/hosts
 mkdir -p /etc/rancher/k3s/
 cp $CONFIGFILE /etc/rancher/k3s/config.yaml
 
-if [ "$NODETYPE" = "server" ]; then
 {{- if .setNodeIPScript }}
+if [ "$NODETYPE" = "server" ]; then
 sh {{ .setNodeIPScript }}
-{{- end }}
 fi
+{{- end }}
 
 if [ -f {{ .registryMirrors }} ]; then
 cp {{ .registryMirrors }} /etc/rancher/k3s/registries.yaml

diff --git a/pkg/combustion/templates/rke2-multi-node-installer.sh.tpl b/pkg/combustion/templates/rke2-multi-node-installer.sh.tpl
@@ -102,11 +102,11 @@ echo "{{ .apiVIP6 }} {{ .apiHost }}" >> /etc/hosts
 mkdir -p /etc/rancher/rke2/
 cp $CONFIGFILE /etc/rancher/rke2/config.yaml
 
-if [ "$NODETYPE" = "server" ]; then
 {{- if .setNodeIPScript }}
+if [ "$NODETYPE" = "server" ]; then
 sh {{ .setNodeIPScript }}
-{{- end }}
 fi
+{{- end }}
 
 if [ -f {{ .registryMirrors }} ]; then
 cp {{ .registryMirrors }} /etc/rancher/rke2/registries.yaml