X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fappc%2Fsrc%2Fmain%2Fscripts%2FstartODL.sh;h=5da71ffc8c9aa2ee8798d2867ac404bef1ba2f34;hb=2ad82140a88efa51cb7e9751d0b45cb0616f6b80;hp=1996cb9fa2493e4bf43fa24cad3a041194fdb92f;hpb=96d258ab43fa73cd9fc1ae5a32d3d9d07828b3a2;p=appc%2Fdeployment.git

diff --git a/installation/appc/src/main/scripts/startODL.sh b/installation/appc/src/main/scripts/startODL.sh
index 1996cb9..5da71ff 100644
--- a/installation/appc/src/main/scripts/startODL.sh
+++ b/installation/appc/src/main/scripts/startODL.sh
@@ -22,14 +22,14 @@
 ###
 
 #
-# This script takes care of installing the SDN-C & APP-C platform components 
-#  if not already installed, and starts the APP-C Docker Container
+# This script takes care of installing the SDNC & APPC platform components 
+#  if not already installed, and starts the APPC Docker Container
 #
 
 ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
 ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
-SDNC_HOME=${SDNC_HOME:-/opt/openecomp/sdnc}
-APPC_HOME=${APPC_HOME:-/opt/openecomp/appc}
+SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc}
+APPC_HOME=${APPC_HOME:-/opt/onap/appc}
 SLEEP_TIME=${SLEEP_TIME:-120}
 MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0}
 
@@ -51,15 +51,6 @@ echo "" >> $APPC_HOME/data/properties/appc.properties
 echo "appc.asdc.env=$DMAAP_TOPIC_ENV" >> $APPC_HOME/data/properties/appc.properties
 echo "" >> $APPC_HOME/data/properties/appc.properties
 
-
-
-#
-# Add the DB hostnames in /etc/hosts (IP address is the MySQL DB IP)
-#
-RUN echo "172.19.0.2      dbhost sdnctldb01 sdnctldb02" >> /etc/hosts
-
-
-
 #
 # Wait for database to init properly
 #
@@ -73,15 +64,18 @@ echo -e "\nmysql ready"
 
 if [ ! -f ${SDNC_HOME}/.installed ]
 then
-	echo "Installing SDN-C database"
+	echo "Installing SDNC database"
 	${SDNC_HOME}/bin/installSdncDb.sh
-	echo "Installing APP-C database"
+	echo "Installing APPC database"
 	${APPC_HOME}/bin/installAppcDb.sh
 	echo "Starting OpenDaylight"
 	${ODL_HOME}/bin/start
 	echo "Waiting ${SLEEP_TIME} seconds for OpenDaylight to initialize"
 	sleep ${SLEEP_TIME}
-	echo "Installing SDN-C platform features"
+	echo "Inserting modified installFeatures.sh for sdnc"
+	rm ${SDNC_HOME}/bin/installFeatures.sh
+	cp ${APPC_HOME}/data/sdncInstallFeatures.sh ${SDNC_HOME}/bin/installFeatures.sh
+	echo "Installing SDNC platform features"
 	${SDNC_HOME}/bin/installFeatures.sh
 	if [ -x ${SDNC_HOME}/svclogic/bin/install.sh ]
 	then
@@ -89,14 +83,20 @@ then
 		${SDNC_HOME}/svclogic/bin/install.sh
 	fi
 	
-	echo "Installing APP-C platform features"
+	echo "Installing APPC platform features"
 	${APPC_HOME}/bin/installFeatures.sh
 	if [ -x ${APPC_HOME}/svclogic/bin/install.sh ]
 	then
-		echo "Installing directed graphs for APP-C"
+		echo "Installing APPC DGs using platform-logic"
 		${APPC_HOME}/svclogic/bin/install.sh
 	fi
 
+	if [ -x ${APPC_HOME}/svclogic/bin/install-converted-dgs.sh ]
+	then
+		echo "Installing APPC JSON DGs converted to XML using dg-loader"
+		${APPC_HOME}/svclogic/bin/install-converted-dgs.sh
+	fi
+
 	echo "Restarting OpenDaylight"
 	${ODL_HOME}/bin/stop
 	echo "Installed at `date`" > ${SDNC_HOME}/.installed