aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Brady <pb071s@att.com>2017-09-07 11:18:21 -0700
committerPatrick Brady <pb071s@att.com>2017-09-07 11:21:14 -0700
commit244bba6a2d841f801ac0040e72479f75253c6969 (patch)
treeebe0b85a9f96b4a2493e54a787e370f9e3d47d98
parent9c0c1d9c4dc3dae0588d53191631e297d8b21dfc (diff)
Changes for ccsdk and new ODL version
Change-Id: I8e19e7b1bb7ea0d36f07ed687cdf90533e147c38 Signed-off-by: Patrick Brady <pb071s@att.com> Issue-Id: APPC-91 Issue-Id: APPC-158
-rw-r--r--installation/appc/src/main/docker/Dockerfile2
-rw-r--r--installation/appc/src/main/scripts/installZips.sh2
-rw-r--r--installation/appc/src/main/scripts/startODL.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/installation/appc/src/main/docker/Dockerfile b/installation/appc/src/main/docker/Dockerfile
index 4cbe30e..786e5b9 100644
--- a/installation/appc/src/main/docker/Dockerfile
+++ b/installation/appc/src/main/docker/Dockerfile
@@ -1,5 +1,5 @@
# Base ubuntu with added packages needed for ONAP
-FROM openecomp/sdnc-image:1.1.2-SNAPSHOT-STAGING-170625-122013
+FROM onap/ccsdk-odlsli-image:latest
MAINTAINER APP-C Team (appc@lists.openecomp.org)
# Set the Env. Variable in the container to add the APPC CONFIG DIR (the SDNC_CONFIG_DIR is inherited from SDNC Image)
diff --git a/installation/appc/src/main/scripts/installZips.sh b/installation/appc/src/main/scripts/installZips.sh
index a39004f..67ea82a 100644
--- a/installation/appc/src/main/scripts/installZips.sh
+++ b/installation/appc/src/main/scripts/installZips.sh
@@ -29,7 +29,7 @@ then
fi
APPC_HOME=${APPC_HOME:-/opt/openecomp/appc}
-SDNC_HOME=${SDNC_HOME:-/opt/openecomp/sdnc}
+SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc}
targetDir=${1:-${APPC_HOME}}
sdnc_targetDir=${1:-${SDNC_HOME}}
diff --git a/installation/appc/src/main/scripts/startODL.sh b/installation/appc/src/main/scripts/startODL.sh
index 1996cb9..c97057c 100644
--- a/installation/appc/src/main/scripts/startODL.sh
+++ b/installation/appc/src/main/scripts/startODL.sh
@@ -28,7 +28,7 @@
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}