# Set from CAP Based PROPS, if necessary
aaf_env=${aaf_env:-"${AAF_ENV}"}
-aaf_release=${aaf_release:-"${VERSION}"}
+aaf_deployed_version=${aaf_deployed_version:-"${VERSION}"}
cadi_latitude=${cadi_latitude:-"${LATITUDE}"}
cadi_longitude=${cadi_longitude:-"${LONGITUDE}"}
cadi_x509_issuers=${cadi_x509_issuers:-"${CADI_X509_ISSUERS}"}
INITIALIZED="true"
fi
+# Should we clean up?
+if [ ! -e "${LOCAL}/VERSION" ] || [ "${VERSION}" != "$(cat ${LOCAL}/VERSION)" ]; then
+ echo "Clean up directory ${LOCAL}"
+ rm -Rf ${LOCAL}/org.osaaf.aaf.*props ${LOCAL}/org.osaaf.aaf.p12
+ ls ${LOCAL}
+fi
+echo "${VERSION}" > $LOCAL/VERSION
+
# Load up Cert/X509 Artifacts
# echo "Check Signer Keyfile"
FILE="$LOCAL/org.osaaf.aaf.signer.p12"
ln -s $PUBLIC/truststoreONAPall.jks $LOCAL
cp $CONFIG/cert/AAF_RootCA.cer $PUBLIC
CM_TRUST_CAS="$PUBLIC/AAF_RootCA.cer"
- echo "cadi_keystore_password=something easy" >> $CONFIG/local/aaf.props
echo "Setup ONAP Test CAs and Signers"
INITIALIZED="true"
fi
fi
-# echo "Check keyfile"
FILE="$LOCAL/org.osaaf.aaf.p12"
if [ ! -e $FILE ]; then
if [ -e $CONFIG/cert/org.osaaf.aaf.p12 ]; then
echo "Bootstrap Creation of Keystore from Signer"
cd $CONFIG/CA
- # Remove this after Casablanca
- CADI_X509_ISSUERS="CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US"
+ # Redo all of this after Dublin
+ export cadi_x509_issuers="CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US"
+ export signer_subj="/CN=intermediateCA_9/OU=OSAAF/O=ONAP/C=US"
bash bootstrap.sh $LOCAL/org.osaaf.aaf.signer.p12 'something easy'
cp aaf.bootstrap.p12 $FILE
if [ -n "$CADI_X509_ISSUERS" ]; then
echo "$S" >> ${TMP}
fi
done
-
cat $TMP
$JAVA_AGENT config \
aaf@aaf.osaaf.org \
cadi_etc_dir=$LOCAL \
+ cadi_latitude=${cadi_latitude} \
+ cadi_longitude=${cadi_longitude} \
cadi_prop_files=$CONFIG/local/initialConfig.props:$CONFIG/local/aaf.props:${TMP}
rm ${TMP}
+ echo "cm_always_ignore_ips=${cm_always_ignore_ips:=false}" >> $LOCAL/org.osaaf.aaf.props;
# Cassandra Config stuff
# Default is expect a Cassandra on same Node