Merge "CA Bootstrapping"

diff --combined auth/docker/aaf.sh
index c41192f,50a7911..5e70403
--- 1/auth/docker/aaf.sh
--- 2/auth/docker/aaf.sh
+++ b/auth/docker/aaf.sh
@@@ -15,17 -15,17 +15,21 @@@ 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"
  }
  
 +function set_it() {
 +  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; do
 +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;
@@@ -44,12 -44,12 +48,15 @@@ if [ "$(docker volume ls | grep aaf_con
    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
  
+   set_prop cm_ca.local "${CM_CA_LOCAL}" org.osaaf.aaf.cm.ca.props
+   set_prop cadi_x509_issuers "${CADI_X509_ISSUERS}" org.osaaf.aaf.props
+ 
    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 "

diff --combined auth/docker/d.props.init
index 7b9cd13,484aba4..68b06ef
--- 1/auth/docker/d.props.init
--- 2/auth/docker/d.props.init
+++ b/auth/docker/d.props.init
@@@ -18,10 -18,12 +18,13 @@@ LATITUDE
  LONGITUDE=
  #
  # Initial AAF Certificate (not Generated)
+ CADI_X509_ISSUERS="CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US"
  AAF_INITIAL_X509_P12=
  AAF_INITIAL_X509_PASSWORD=
 +CADI_X509_ISSUERS=
  
  # CA info (leave blank unless functioning as CA)
  AAF_SIGNER_P12=
  AAF_SIGNER_PASSWORD=
+ CM_CA_LOCAL=
+