From: Todd Malsbary <todd.malsbary@intel.com>
Date: Wed, 2 Mar 2022 22:20:39 +0000 (-0800)
Subject: Preserve user_config.sh vars in vagrant deploy
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=bac0122dc4fd62c747f766a617b8fe4a5a05633d;p=icn.git

Preserve user_config.sh vars in vagrant deploy

Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Change-Id: Ia77cf777ae53e28930e355b5020dfb82696d5735
---

diff --git a/tools/vagrant/create_user_config.sh b/tools/vagrant/create_user_config.sh
index e753481..c27cad1 100755
--- a/tools/vagrant/create_user_config.sh
+++ b/tools/vagrant/create_user_config.sh
@@ -1,17 +1,13 @@
 #!/bin/bash
 set -eu -o pipefail
 
-cat <<EOF >user_config.sh
-#!/usr/bin/env bash
+SCRIPTDIR="$(readlink -f $(dirname ${BASH_SOURCE[0]}))"
+ICNDIR="$(dirname $(dirname ${SCRIPTDIR}))"
 
-#Ironic Metal3 settings for provisioning network
-export IRONIC_INTERFACE="eth1"
-EOF
+sed -i -e 's/IRONIC_INTERFACE=.*/IRONIC_INTERFACE="eth1"/' ${ICNDIR}/user_config.sh
 
 if [[ ! -z "${DOCKER_REGISTRY_MIRRORS+x}" ]]; then
-    cat <<EOF >>user_config.sh
-
-#Use a registry mirror for downloading container images
-export DOCKER_REGISTRY_MIRRORS="${DOCKER_REGISTRY_MIRRORS}"
-EOF
+    sed -i -e 's/DOCKER_REGISTRY_MIRRORS=.*/DOCKER_REGISTRY_MIRRORS="'"${DOCKER_REGISTRY_MIRRORS}"'"/' ${ICNDIR}/user_config.sh
+else
+    sed -i -e 's/DOCKER_REGISTRY_MIRRORS=.*/DOCKER_REGISTRY_MIRRORS=""/' ${ICNDIR}/user_config.sh
 fi