diff options
| author |   Instrumental <jonathan.gathman@att.com> | 2018-10-15 07:37:28 -0500 |
|---|---|---|
| committer | Instrumental <jonathan.gathman@att.com> | 2018-10-15 07:38:55 -0500 |
| commit | 93871ff58e90a91d359f72b00a92fe1e28310b82 (patch) | |
| tree | 199885fe72c46ae15ef06d95ff3be28ce9469b83 /auth/sample/bin | |
| parent | 1ccc1ca3fbd7bc1357a4d63d5fa5a29ce3f0ab67 (diff) | |
Add Servlet Sample
Includes CA Bootstrap names for K8
Issue-ID: AAF-451
Change-Id: Ibc34a21cad0b38c5d56dbc20d84deb5bf66e9d64
Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'auth/sample/bin')
| -rwxr-xr-x | auth/sample/bin/client.sh | 3 | ||||
| -rw-r--r-- | auth/sample/bin/service.sh | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/auth/sample/bin/client.sh b/auth/sample/bin/client.sh index 99ed2793..a7095268 100755 --- a/auth/sample/bin/client.sh +++ b/auth/sample/bin/client.sh @@ -208,6 +208,9 @@ if [ ! "$CMD" = "" ]; then echo "--- agent Tool Comands ---" $JAVA -Dcadi_prop_files=$LOCAL/${NS}.props -jar $CONFIG/bin/aaf-cadi-aaf-*-full.jar ;; + sample) + echo "--- run Sample Servlet App ---" + $JAVA -Dcadi_prop_files=$LOCAL/${NS}.props -cp $CONFIG/bin/aaf-cadi-aaf-*-full.jar:$CONFIG/bin/aaf-cadi-servlet-sample-*-sample.jar org.onap.aaf.sample.cadi.jetty.JettyStandalone ${NS}.props esac echo "" ;; 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}/" \ |