X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fdocker%2Faaf.sh;h=29391597444d4329a96e3c39e58079e63b45f31a;hb=refs%2Fchanges%2F75%2F70475%2F1;hp=c41192fe2ce65f0b4d3716de14b7bc8b90669777;hpb=b8a8129f13ba7a986b4937ff64645e466078a003;p=aaf%2Fauthz.git

diff --git a/auth/docker/aaf.sh b/auth/docker/aaf.sh
index c41192fe..29391597 100644
--- a/auth/docker/aaf.sh
+++ b/auth/docker/aaf.sh
@@ -1,61 +1,43 @@
 #!/bin/bash
 . ./d.props
+if [ -e ./cass.props ]; then
+  . ./cass.props
+fi
 
+DOCKER=${DOCKER:=docker}
 function run_it() {
-  docker run $@ \
-    --mount 'type=volume,src=aaf_config,dst='$CONF_ROOT_DIR',volume-driver=local' \
+  $DOCKER run $@ \
+    -v "aaf_config:$CONF_ROOT_DIR" \
     --add-host="$HOSTNAME:$HOST_IP" \
     --add-host="aaf.osaaf.org:$HOST_IP" \
+    --env HOSTNAME=${HOSTNAME} \
     --env AAF_ENV=${AAF_ENV} \
     --env AAF_REGISTER_AS=${AAF_REGISTER_AS} \
+    --env AAF_LOCATOR_AS=${AAF_LOCATOR_AS} \
     --env LATITUDE=${LATITUDE} \
     --env LONGITUDE=${LONGITUDE} \
+    --env CASS_HOST=${CASS_HOST} \
+    --env CASSANDRA_CLUSTER=${CASSANDRA_CLUSTER} \
+    --env CASSANDRA_USER=${CASSANDRA_USER} \
+    --env CASSANDRA_PASSWORD=${CASSANDRA_PASSWORD} \
+    --env CASSANDRA_PORT=${CASSANDRA_PORT} \
     --name aaf_config_$USER \
     $PREFIX${ORG}/${PROJECT}/aaf_config:${VERSION} \
     /bin/bash $PARAMS
 }
 
+function set_prop() {
+  $DOCKER exec -t aaf_config_$USER /bin/bash /opt/app/aaf_config/bin/agent.sh NOOP setProp "$1" "$2" "$3"
+}
+
 function encrypt_it() {
-  docker exec -t aaf_config_$USER /bin/bash /opt/app/aaf_config/bin/agent.sh NOOP encrypt "$1" "$2"
+  $DOCKER exec -t aaf_config_$USER /bin/bash /opt/app/aaf_config/bin/agent.sh NOOP encrypt "$1" "$2"
 }
 
 function set_it() {
-  docker exec -t aaf_config_$USER /bin/bash /opt/app/aaf_config/bin/agent.sh NOOP setProp "$1" "$2"
+  $DOCKER exec -t aaf_config_$USER /bin/bash /opt/app/aaf_config/bin/agent.sh NOOP setProp "$1" "$2"
 }
 
-P12_LOAD="no"
-
-for PROP in AAF_INITIAL_X509_P12 AAF_INITIAL_X509_PASSWORD AAF_SIGNER_P12 AAF_SIGNER_PASSWORD CADI_X509_ISSUERS; do
-    if [ "${!PROP}" != "" ]; then
-    	  P12_LOAD='yes'
-	  break;
-    fi 
-done
-
-# First Time Run does a bit more setup
-if [ "$(docker volume ls | grep aaf_config)" = "" ] && [ ${P12_LOAD} = "yes" ]; then
-  echo "Initializing first aaf_config"
-  if [ "$(docker container ls | grep aaf_config_$USER)" = "" ]; then
-	PARAMS="bash"
-	run_it -t -d 
-  else 
-	echo "aaf_config_$USER is already running"
-  fi	
-  docker container cp ${AAF_INITIAL_X509_P12} aaf_config_$USER:/opt/app/osaaf/local/org.osaaf.aaf.p12
-  docker container cp ${AAF_SIGNER_P12} aaf_config_$USER:/opt/app/osaaf/local/org.osaaf.aaf.signer.p12
-
-  encrypt_it cadi_keystore_password "${AAF_INITIAL_X509_PASSWORD}"
-  encrypt_it cm_ca.local "${AAF_SIGNER_PASSWORD}"
-
-  set_it cadi_x509_issuers "${CADI_X509_ISSUERS}"
-
-
-  echo -n "Stopping "
-  docker container stop aaf_config_$USER 
-  echo -n "Removing "
-  docker container rm aaf_config_$USER
-fi
-
 PARAMS="$@"
 if [ "$PARAMS" != "" ]; then
   run_it -it --rm