Update relative paths after change 2464

Change-Id: Idd9ec4507c975a5533ca3f3ef4b22bdd7bc7babe
Signed-off-by: wrider <lji@research.att.com>
Issue-ID: INT-79

diff --git a/ci/package-tag.yaml b/ci/package-tag.yaml
index be581bf..7efdb02 100644 (file)
--- 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 fd350b6..2cd4f1b 100755 (executable)
--- 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 6722b7e..d02ec1d 100755 (executable)
--- 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 e32d2e7..3df73b3 100755 (executable)
--- 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 <<EOF
 #

diff --git a/tools/k8s/bin/install b/tools/k8s/bin/install
index 6b03800..f9bf50e 100755 (executable)
--- a/tools/k8s/bin/install
+++ b/tools/k8s/bin/install
@@ -35,8 +35,8 @@ 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"
+HEAT_DIR="$WORKSPACE/tools/k8s/heat"
+BIN_DIR="$WORKSPACE/tools/k8s/bin"
 
 
 stackname=aux