commit a9cfee3451327529eb24552162a92dfc7d10fb46
author Vasyl Saienko <vsaienko@mirantis.com> Wed May 14 12:59:27 2025 +0000
committer Gerrit Code Review <gerrit@172.18.228.132> Wed May 14 12:59:27 2025 +0000
tree 29ba0eb50b6f04756515f1e62dc3f69dbc0c79d2
parent 36b4ac11376bfae94d46e22786945b32787f0117
parent c5a3c1821115f18b548fd4582a7de729851fc05b

Merge "Retry nerdctl tag command"

de/heat-templates/scripts/functions.sh

diff --git a/de/heat-templates/scripts/functions.sh b/de/heat-templates/scripts/functions.sh
index 7c44921..4524075 100644
--- a/de/heat-templates/scripts/functions.sh
+++ b/de/heat-templates/scripts/functions.sh
@@ -790,7 +790,7 @@
 
 # Remove Tunnel interface from netplan
 if [[ $TUNNEL_INTERFACE_NETPLAN_MANAGE == false ]]; then
-    sed -i "/    ${TUNNEL_INTERFACE}/,/      set-name: ${TUNNEL_INTERFACE}/d" ${cloud_netplan_cfg}
+yq d -i ${cloud_netplan_cfg} network.ethernets.${TUNNEL_INTERFACE}
 fi
 
 if [[ -n ${IRONIC_BAREMETAL_INTERFACE} ]]; then
@@ -931,7 +931,11 @@
 
     if [[ "${apply_grub}" == true ]]; then
         update-grub
-        cloud-init clean -r
+        cloud-init clean --reboot
+        # waiting for reboot to prevent sending wait condition status failure
+        sleep 600
+        echo "Failed to reboot node"
+        /bin/false
     else
         echo "GRUB already configured with huge pages"
     fi