From: wrider Date: Tue, 18 Feb 2020 17:48:23 +0000 (-0500) Subject: Update relative paths after change 2464 X-Git-Tag: f-release~132 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=0bb98e2a804addfb15cdc7b7c42141d689166079;p=it%2Fdep.git Update relative paths after change 2464 Change-Id: Idd9ec4507c975a5533ca3f3ef4b22bdd7bc7babe Signed-off-by: wrider Issue-ID: INT-79 --- diff --git a/ci/package-tag.yaml b/ci/package-tag.yaml index be581bf8..7efdb028 100644 --- a/ci/package-tag.yaml +++ b/ci/package-tag.yaml @@ -14,4 +14,4 @@ # See the License for the specific language governing permissions and # # limitations under the License. # ################################################################################ -tag: 3.0.0 +tag: 3.0.1 diff --git a/tools/k8s/bin/deploy-stack.sh b/tools/k8s/bin/deploy-stack.sh index fd350b66..2cd4f1b6 100755 --- a/tools/k8s/bin/deploy-stack.sh +++ b/tools/k8s/bin/deploy-stack.sh @@ -78,10 +78,10 @@ fi if [ -z "$WORKSPACE" ]; then export WORKSPACE=`git rev-parse --show-toplevel` fi -HEAT_DIR="$WORKSPACE/ric-infra/00-Kubernetes/heat" -BIN_DIR="$WORKSPACE/ric-infra/00-Kubernetes/bin" -ETC_DIR="$WORKSPACE/ric-infra/00-Kubernetes/etc" -ENV_DIR="$WORKSPACE/ric-infra/00-Kubernetes/heat/env" +HEAT_DIR="$WORKSPACE/tools/k8s/heat" +BIN_DIR="$WORKSPACE/tools/k8s/bin" +ETC_DIR="$WORKSPACE/tools/k8s/etc" +ENV_DIR="$WORKSPACE/tools/k8s/heat/env" cd $BIN_DIR diff --git a/tools/k8s/bin/gen-cloud-init.sh b/tools/k8s/bin/gen-cloud-init.sh index 6722b7e8..d02ec1da 100755 --- a/tools/k8s/bin/gen-cloud-init.sh +++ b/tools/k8s/bin/gen-cloud-init.sh @@ -44,10 +44,11 @@ set +a if [ -z "$WORKSPACE" ]; then export WORKSPACE=`git rev-parse --show-toplevel` fi -HEAT_DIR="$WORKSPACE/ric-infra/00-Kubernetes/heat" -BIN_DIR="$WORKSPACE/ric-infra/00-Kubernetes/bin" -ETC_DIR="$WORKSPACE/ric-infra/00-Kubernetes/etc" -ENV_DIR="$WORKSPACE/ric-infra/00-Kubernetes/heat/env" + +HEAT_DIR="$WORKSPACE/tools/k8s/heat" +BIN_DIR="$WORKSPACE/tools/k8s/bin" +ETC_DIR="$WORKSPACE/tools/k8s/etc" +ENV_DIR="$WORKSPACE/tools/k8s/heat/env" if [ -z "$1" ]; then TMPL="${HEAT_DIR}/scripts/k8s_vm_install.sh" diff --git a/tools/k8s/bin/gen-ric-heat-yaml.sh b/tools/k8s/bin/gen-ric-heat-yaml.sh index e32d2e7b..3df73b3d 100755 --- a/tools/k8s/bin/gen-ric-heat-yaml.sh +++ b/tools/k8s/bin/gen-ric-heat-yaml.sh @@ -59,7 +59,7 @@ fi if [ -z "$WORKSPACE" ]; then export WORKSPACE=`git rev-parse --show-toplevel` fi -PARTS_DIR=$WORKSPACE/ric-infra/00-Kubernetes/heat/parts +PARTS_DIR=$WORKSPACE/tools/k8s/heat/parts cat <