X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fdocker%2Faaf.sh;h=3fc41496ea1fc9d812d34c5feab5cb645952a00d;hb=54883b4545dc32a5e4c7fbe0a49ef5b89a615435;hp=efd4fe3757e6af3b1c5c90f9163203ad593ef04b;hpb=6f4e9032175b23aa84462bcf5f3a3054e6516453;p=aaf%2Fauthz.git

diff --git a/auth/docker/aaf.sh b/auth/docker/aaf.sh
index efd4fe37..3fc41496 100644
--- a/auth/docker/aaf.sh
+++ b/auth/docker/aaf.sh
@@ -6,6 +6,7 @@ function run_it() {
     --mount 'type=volume,src=aaf_config,dst='$CONF_ROOT_DIR',volume-driver=local' \
     --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 LATITUDE=${LATITUDE} \
@@ -15,39 +16,17 @@ function run_it() {
     /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"
 }
 
-P12_LOAD="no"
-
-for PROP in AAF_INITIAL_X509_P12 AAF_INITIAL_X509_PASSWORD AAF_SIGNER_P12 AAF_SIGNER_PASSWORD; 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}"
-
-  echo -n "Stopping "
-  docker container stop aaf_config_$USER 
-  echo -n "Removing "
-  docker container rm aaf_config_$USER
-fi
+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