From 6a1ddb5e38cf8fa29f84c4b6ac4172bc1063691a Mon Sep 17 00:00:00 2001 From: Instrumental Date: Thu, 19 Mar 2020 08:10:12 -0500 Subject: Fix standalone Batch Jars Issue-ID: AAF-1114 Signed-off-by: Instrumental Change-Id: I6ceb7ef714b3c7c2b33371abfca9202746151231 --- auth/auth-cass/cass_init/authBatch.props | 23 ++++++++++------------- auth/auth-cass/cass_init/cmd.sh | 3 ++- auth/auth-cass/cass_init/restore.sh | 2 +- 3 files changed, 13 insertions(+), 15 deletions(-) (limited to 'auth/auth-cass/cass_init') diff --git a/auth/auth-cass/cass_init/authBatch.props b/auth/auth-cass/cass_init/authBatch.props index 0505ce8b..bef1659b 100644 --- a/auth/auth-cass/cass_init/authBatch.props +++ b/auth/auth-cass/cass_init/authBatch.props @@ -1,24 +1,21 @@ -aaf_data_dir=/opt/app/aaf/data +aaf_data_dir=/opt/app/aaf/cass_init/data aaf_root_ns=org.osaaf.aaf cadi_latitude=38.0 cadi_longitude=-72.0 +cadi_loglevel=INFO ## Supported Plugin Organizational Units Organization.att.com=org.onap.aaf.org.DefaultOrg DRY_RUN=false -CASS_ENV=DOCKER - -UNKNOWN.LOG_DIR=logs/DOCKER ## Cassandra Configurations, when commented out, uses LocalHost (non authenticated) and default ports -DOCKER.cassandra.clusters=127.0.0.1 -DOCKER.cassandra.clusters.port=9042 -DOCKER.cassandra.clusters.user=cassandra -DOCKER.cassandra.clusters.password=cassandra -DOCKER.VERSION=3.1.0 -DOCKER.GUI_URL=https://mithrilcsp.sbc.com:8095/gui -DOCKER.MAX_EMAILS=3 -DOCKER.SPECIAL_NAMES=aaf@aaf.osaaf.org +cassandra.clusters=127.0.0.1 +cassandra.clusters.port=9042 +cassandra.clusters.user=cassandra +cassandra.clusters.password=cassandra + +GUI_URL=https://aaf-gui.onap:8095/gui +MAX_EMAILS=3 +SPECIAL_NAMES=aaf@aaf.osaaf.org -cadi_loglevel=AUDIT diff --git a/auth/auth-cass/cass_init/cmd.sh b/auth/auth-cass/cass_init/cmd.sh index dc3e7f80..d9120872 100644 --- a/auth/auth-cass/cass_init/cmd.sh +++ b/auth/auth-cass/cass_init/cmd.sh @@ -135,7 +135,8 @@ function install_onap { status prep data bash prep.sh status push data to cassandra - bash push.sh + # bash push.sh + echo "YES" | bash restore.sh cd - echo $(date) > $AAF_INIT_DATA fi diff --git a/auth/auth-cass/cass_init/restore.sh b/auth/auth-cass/cass_init/restore.sh index 528978af..abc6a7cc 100644 --- a/auth/auth-cass/cass_init/restore.sh +++ b/auth/auth-cass/cass_init/restore.sh @@ -52,7 +52,7 @@ done if [ ! "$UPLOAD" = "" ]; then cd dats - java -Dcadi_prop_files=../authBatch.props -DCASS_ENV=$ENV -jar ../aaf-auth-batch-*-full.jar Upload $UPLOAD + java -Dcadi_prop_files=../authBatch.props -DCASS_ENV=$ENV -jar ../aaf-auth-batch-*-full.jar Upload $UPLOAD 2>&1 logs/stdout cd - fi -- cgit 1.2.3-korg