extra static ip for deploying 2 spokes

karmab · Oct 16, 2024 · f5ba407 · f5ba407
1 parent 633a4d8
commit f5ba407
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/paramfiles/lab_ipv6.yml b/paramfiles/lab_ipv6.yml
@@ -19,6 +19,7 @@ static_ips:
 - 2620:52:0:1302::21
 - 2620:52:0:1302::22
 - 2620:52:0:1302::23
+- 2620:52:0:1302::24
 
 spokes:
 - name: mgmt-spoke1

diff --git a/ztp/scripts/03_spokes_deploy.sh b/ztp/scripts/03_spokes_deploy.sh
@@ -9,6 +9,14 @@ export SSH_PUB_KEY=$(cat /root/.ssh/id_rsa.pub)
 BAREMETAL_IP=$(ip -o addr show eth0 | head -1 | awk '{print $4}' | cut -d'/' -f1)
 echo $BAREMETAL_IP | grep -q ':' && BAREMETAL_IP=[$BAREMETAL_IP]
 export BAREMETAL_IP
+
+{% for spoke in spokes %}
+{% if spoke.get('virtual_nodes', 0) > 0 %}
+kcli delete iso -y {{ spoke.name }}.iso || true
+{% endif %}
+{% endfor %}
+
+
 envsubst < /root/ztp/scripts/requirements.sample.yml > /root/ztp/scripts/requirements.yml
 envsubst < /root/ztp/scripts/siteconfig.sample.yml > /root/ztp/scripts/siteconfig.yml
 

diff --git a/ztp/scripts/04_spokes_wait.sh b/ztp/scripts/04_spokes_wait.sh
@@ -4,13 +4,9 @@ export PYTHONUNBUFFERED=true
 {% set spoke_deploy = spoke.get('deploy', spoke_deploy) %}
 {% set spoke_ctlplanes_number = spoke.get('ctlplanes', 1) %}
 {% set spoke_workers_number = spoke.get('workers', 0) %}
-{% set virtual_nodes_number = spoke.get('virtual_nodes', 0) %}
 {% if spoke_deploy and spoke.get('wait', spoke_wait) %}
 {% set spoke_wait_time = spoke.get('wait_time', spoke_wait_time) %}
 SPOKE={{ spoke.name }}
-{% if virtual_nodes_number > 0 %}
-kcli delete iso -y $SPOKE.iso || true
-{% endif %}
 timeout=0
 installed=false
 failed=false
@@ -40,6 +36,5 @@ elif [ "$failed" == "true" ] ; then
 else
   echo Timeout waiting for spoke cluster $SPOKE to be deployed
 fi
-
 {% endif %}
 {% endfor %}