X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fsample%2Fbin%2Fservice.sh;h=6b694adc0040fbdff54b14b2fad14943a3652165;hb=refs%2Fchanges%2F75%2F70475%2F1;hp=b6121ead101ad47a854c0921a5bc5d1c1aed6c81;hpb=1ccc1ca3fbd7bc1357a4d63d5fa5a29ce3f0ab67;p=aaf%2Fauthz.git diff --git a/auth/sample/bin/service.sh b/auth/sample/bin/service.sh index b6121ead..6b694adc 100644 --- a/auth/sample/bin/service.sh +++ b/auth/sample/bin/service.sh @@ -89,7 +89,7 @@ if [ ! -e $LOCAL/org.osaaf.aaf.props ]; then echo cadi_longitude=${LONGITUDE} >> ${TMP} echo cadi_x509_issuers=${CADI_X509_ISSUERS} >> ${TMP} echo aaf_register_as=${AAF_REGISTER_AS} >> ${TMP} - LOCATOR_AS=${LOCATOR:=AAF_REGISTER_AS} + AAF_LOCATOR_AS=${AAF_LOCATOR_AS:=$AAF_REGISTER_AS} echo aaf_locate_url=https://${AAF_LOCATOR_AS}:8095 >> ${TMP} cat $TMP @@ -101,7 +101,7 @@ if [ ! -e $LOCAL/org.osaaf.aaf.props ]; then # Cassandra Config stuff # Default is expect a Cassandra on same Node - CASS_HOST=${CASS_HOST:="localhost:127.0.0.1"} + CASS_HOST=${CASS_HOST:="aaf_cass"} CASS_PASS=$("$JAVA" -jar $CONFIG/bin/aaf-cadi-aaf-*-full.jar cadi digest "${CASSANDRA_PASSWORD:-cassandra}" $LOCAL/org.osaaf.aaf.keyfile) CASS_NAME=${CASS_HOST/:*/} sed -i.backup -e "s/\\(cassandra.clusters=\\).*/\\1${CASSANDRA_CLUSTERS:=$CASS_HOST}/" \