X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fdocker%2Faaf.sh;h=29391597444d4329a96e3c39e58079e63b45f31a;hb=93871ff58e90a91d359f72b00a92fe1e28310b82;hp=441cf2b4951a221ec401c3f309e824938231cfe4;hpb=3aca33c5bb9af1ba4df574ceb90435f54d14ccf5;p=aaf%2Fauthz.git

diff --git a/auth/docker/aaf.sh b/auth/docker/aaf.sh
index 441cf2b4..29391597 100644
--- a/auth/docker/aaf.sh
+++ b/auth/docker/aaf.sh
@@ -1,16 +1,45 @@
 #!/bin/bash
 . ./d.props
+if [ -e ./cass.props ]; then
+  . ./cass.props
+fi
 
-docker run \
-    -it \
-    --rm \
-    --mount 'type=volume,src=aaf_config,dst='$CONF_ROOT_DIR',volume-driver=local' \
+DOCKER=${DOCKER:=docker}
+function run_it() {
+  $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 \
-    ${ORG}/${PROJECT}/aaf_config:${VERSION} \
-    /bin/bash "$@"
+    $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"
+}
+
+function set_it() {
+  $DOCKER exec -t aaf_config_$USER /bin/bash /opt/app/aaf_config/bin/agent.sh NOOP setProp "$1" "$2"
+}
+
+PARAMS="$@"
+if [ "$PARAMS" != "" ]; then
+  run_it -it --rm 
+fi
+