From 83f4c3287c7a93902236538f3aa72c516a47a88c Mon Sep 17 00:00:00 2001 From: George Kitsos Date: Tue, 30 Apr 2024 17:01:57 +0300 Subject: [PATCH] feat: Add PUBLIC_IP and SSH_PORT to nm-bootstrap-script.sh execution Change-Id: I23fdfd9a13fd5978930c78b77795a35b5f73ad4b --- installation-scripts-onm/MASTER_PRE_INSTALL_SCRIPT.sh | 2 +- installation-scripts-onm/WORKER_PRE_INSTALL_SCRIPT.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/installation-scripts-onm/MASTER_PRE_INSTALL_SCRIPT.sh b/installation-scripts-onm/MASTER_PRE_INSTALL_SCRIPT.sh index 0098772..982b725 100644 --- a/installation-scripts-onm/MASTER_PRE_INSTALL_SCRIPT.sh +++ b/installation-scripts-onm/MASTER_PRE_INSTALL_SCRIPT.sh @@ -3,7 +3,7 @@ echo "Master pre-install script\n" sudo hostnamectl set-hostname "$variables_PA_JOB_NAME" sudo -H -u ubuntu bash -c 'wget https://opendev.org/nebulous/sal-scripts/raw/branch/master/onm/nm-bootstrap-script.sh && chmod +x nm-bootstrap-script.sh' -sudo -H -u ubuntu bash -c "./nm-bootstrap-script.sh 'CREATE' 'MASTER' $APPLICATION_ID 158.39.201.249"; +sudo -H -u ubuntu bash -c "./nm-bootstrap-script.sh 'CREATE' 'MASTER' $APPLICATION_ID 158.39.201.249 $PUBLIC_IP $SSH_PORT"; echo "" echo "" sleep 60 diff --git a/installation-scripts-onm/WORKER_PRE_INSTALL_SCRIPT.sh b/installation-scripts-onm/WORKER_PRE_INSTALL_SCRIPT.sh index 363d052..8884683 100644 --- a/installation-scripts-onm/WORKER_PRE_INSTALL_SCRIPT.sh +++ b/installation-scripts-onm/WORKER_PRE_INSTALL_SCRIPT.sh @@ -2,7 +2,7 @@ echo "Worker pre-install script" sudo hostnamectl set-hostname "$variables_PA_JOB_NAME" sudo -H -u ubuntu bash -c 'wget https://opendev.org/nebulous/sal-scripts/raw/branch/master/onm/nm-bootstrap-script.sh && chmod +x nm-bootstrap-script.sh' -sudo -H -u ubuntu bash -c "./nm-bootstrap-script.sh 'CREATE' 'WORKER' $APPLICATION_ID 158.39.201.249"; +sudo -H -u ubuntu bash -c "./nm-bootstrap-script.sh 'CREATE' 'WORKER' $APPLICATION_ID 158.39.201.249 $PUBLIC_IP $SSH_PORT"; WIREGUARD_VPN_IP=`ip a | grep wg | grep inet | awk '{print $2}' | cut -d'/' -f1`; echo "WIREGUARD_VPN_IP= $WIREGUARD_VPN_IP";