From: Lusheng Ji <lji@research.att.com>
Date: Thu, 21 Sep 2017 06:14:55 +0000 (+0000)
Subject: Modify CODE_SOURCE CODE_VERSION use
X-Git-Tag: v1.1.0~28
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F15%2F14115%2F1;p=dcaegen2%2Fdeployments.git

Modify CODE_SOURCE CODE_VERSION use

Issue-Id: DCAEGEN2-60
Change-Id: I64068defd859a3c077b730473ba735489e81e971
Signed-off-by: Lusheng Ji <lji@research.att.com>
---

diff --git a/scripts/cdap-init.sh b/scripts/cdap-init.sh
index d4f1715..d3c1b08 100644
--- a/scripts/cdap-init.sh
+++ b/scripts/cdap-init.sh
@@ -345,7 +345,12 @@ then
 	su - hive -c 'nohup /usr/hdp/current/hive-metastore/bin/hive --service metastore >>/var/log/hive/hive.out 2>>/var/log/hive/hive.log </dev/null &'
 	(cd /bin; wget https://raw.githubusercontent.com/caskdata/cdap-monitoring-tools/develop/nagios/check_cdap/bin/check_cdap)
 	chmod 755 /bin/check_cdap
-	wget -qO- $CODE_SOURCE/${CODE_VERSION}/raw/cloud_init/instconsulagentub16.sh >/tmp/cinst.sh
+        # lji: making more flexible:
+        # for LF nexus:  
+        #     CODE_SOURCE='https://nexus.onap.org/service/local/repositories/raw/content'
+        #     CODE_VERSION=org.onap.dcaegen2.deployments/releases/scripts
+	#wget -qO- $CODE_SOURCE/${CODE_VERSION}/raw/cloud_init/instconsulagentub16.sh >/tmp/cinst.sh
+	wget -qO- $CODE_SOURCE/${CODE_VERSION}/instconsulagentub16.sh >/tmp/cinst.sh
 	bash /tmp/cinst.sh <<!EOF
 {
   "bind_addr": "0.0.0.0",