summaryrefslogtreecommitdiffstats
path: root/installation
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2021-02-22 21:03:45 +0000
committerGerrit Code Review <gerrit@onap.org>2021-02-22 21:03:45 +0000
commitb2133ba3b6ce45a06547106ade3d297299c859e8 (patch)
tree65157da5adc883f90e438f5b08f1611aa1a22197 /installation
parent32cd336379716eb9ca73b0ca67fb9fe1168149f4 (diff)
parent6c8e5f794e51072f5099f27559eafcbfc4cc4ca3 (diff)
Merge "Fix env variable names in startODL.sh"
Former-commit-id: a6f0c28eb9c642243973cdd8ad588f7d68ec264d
Diffstat (limited to 'installation')
-rw-r--r--installation/sdnc/pom.xml2
-rwxr-xr-xinstallation/sdnc/src/main/scripts/startODL.sh8
2 files changed, 5 insertions, 5 deletions
diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index 5cc35d65..be951d2d 100644
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -155,7 +155,7 @@
<alias>sdnc-container</alias>
<run>
<env>
- <ODL_PASSWORD>admin</ODL_PASSWORD>
+ <ODL_ADMIN_PASSWORD>admin</ODL_ADMIN_PASSWORD>
<MYSQL_ROOT_PASSWORD>itsASecret</MYSQL_ROOT_PASSWORD>
<MYSQL_USER>sdnctl</MYSQL_USER>
<MYSQL_PASSWORD>gamma</MYSQL_PASSWORD>
diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh
index bcf8893c..7a224877 100755
--- a/installation/sdnc/src/main/scripts/startODL.sh
+++ b/installation/sdnc/src/main/scripts/startODL.sh
@@ -212,7 +212,7 @@ printf "Installing SDNC/R from startODL.sh script\n"
ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
ODL_FEATURES_BOOT_FILE=$ODL_HOME/etc/org.apache.karaf.features.cfg
-ODL_USER=${ODL_USER:-admin}
+ODL_ADMIN_USERNAME=${ODL_ADMIN_USERNAME:-admin}
ODL_REMOVEIDMDB=${ODL_REMOVEIDMDB:-true}
if $ODL_REMOVEIDMDB ; then
@@ -253,7 +253,7 @@ SDNR_NORTHBOUND=${SDNR_NORTHBOUND:-false}
SDNR_NORTHBOUND_BOOTFEATURES=${SDNR_NORTHBOUND_BOOTFEATURES:-sdnr-northbound-all}
NOTOK=1
#export for installCerts.py
-export ODL_PASSWORD ODL_USER
+export ODL_ADMIN_PASSWORD ODL_ADMIN_USERNAME
if $JDEBUG ; then
printf "Activate remote debugging\n"
@@ -326,8 +326,8 @@ if $SDNRINIT ; then
fi
# do not start container if ADMIN_PASSWORD is not set
-if [ -z "$ODL_PASSWORD" ]; then
- echo "ODL_PASSWORD is not set"
+if [ -z "$ODL_ADMIN_PASSWORD" ]; then
+ echo "ODL_ADMIN_PASSWORD is not set"
exit 1
fi