Removing sdnc resource assignment from start

[appc/deployment.git] / installation / appc / src / main / scripts / startODL.sh

diff --git a/installation/appc/src/main/scripts/startODL.sh b/installation/appc/src/main/scripts/startODL.sh
index 00702e3..658ace8 100644 (file)
--- a/installation/appc/src/main/scripts/startODL.sh
+++ b/installation/appc/src/main/scripts/startODL.sh
@@ -1,10 +1,34 @@
 #!/bin/bash
 
-# Install SDN-C & APP-C platform components if not already installed and start container
+###
+# ============LICENSE_START=======================================================
+# APPC
+# ================================================================================
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+###
+
+#
+# This script takes care of installing the SDN-C & APP-C platform components 
+#  if not already installed, and starts the APP-C Docker Container
+#
 
 ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
 ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
-SDNC_HOME=${SDNC_HOME:-/opt/openecomp/sdnc}
+SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc}
 APPC_HOME=${APPC_HOME:-/opt/openecomp/appc}
 SLEEP_TIME=${SLEEP_TIME:-120}
 MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0}
@@ -22,7 +46,6 @@ if [ -z "$DMAAP_TOPIC_ENV" ]
                echo "DMAAP_TOPIC_ENV shell variable exists and it's $DMAAP_TOPIC_ENV"
 fi
 
-
 echo "Adding a value to property appc.asdc.env in appc.properties for appc-asdc-listener feature"
 echo "" >> $APPC_HOME/data/properties/appc.properties
 echo "appc.asdc.env=$DMAAP_TOPIC_ENV" >> $APPC_HOME/data/properties/appc.properties
@@ -30,6 +53,13 @@ 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
 #
@@ -45,10 +75,15 @@ if [ ! -f ${SDNC_HOME}/.installed ]
 then
        echo "Installing SDN-C database"
        ${SDNC_HOME}/bin/installSdncDb.sh
+       echo "Installing APP-C 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 "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 SDN-C platform features"
        ${SDNC_HOME}/bin/installFeatures.sh
        if [ -x ${SDNC_HOME}/svclogic/bin/install.sh ]
@@ -70,4 +105,4 @@ then
        echo "Installed at `date`" > ${SDNC_HOME}/.installed
 fi
 
-exec ${ODL_HOME}/bin/karaf
\ No newline at end of file
+exec ${ODL_HOME}/bin/karaf