diff options
| author |   Dan Timoney <dtimoney@att.com> | 2021-02-22 15:20:58 -0500 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2021-02-22 15:31:51 -0500 |
| commit | 6c8e5f794e51072f5099f27559eafcbfc4cc4ca3 (patch) | |
| tree | 116b48567927afe5ce10135231d66d92673e13c4 | |
| parent | 38d8f5f82c952db34e139488dd7619f620ecc742 (diff) | |
Fix env variable names in startODL.sh
Variable names in startODL.sh script should match those used
in patch for AAA module (ODL_ADMIN_USERNAME/ODL_ADMIN_PASSWORD)
Change-Id: I12129c0d9e0b08d4ae5fda38e7ae9ed91d5a0899
Issue-ID: SDNC-1482
Signed-off-by: Dan Timoney <dtimoney@att.com>
Former-commit-id: 30c9f4df4b1cff6be61294d8d646bc0de8b3e565
| -rw-r--r-- | installation/sdnc/pom.xml | 2 | ||||
| -rwxr-xr-x | installation/sdnc/src/main/scripts/startODL.sh | 8 |
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 |