diff options
| author |   Instrumental <jonathan.gathman@att.com> | 2018-09-17 19:21:19 -0500 |
|---|---|---|
| committer | Instrumental <jonathan.gathman@att.com> | 2018-09-17 19:21:43 -0500 |
| commit | 3237aa25ac96300ceb24e69794cf0cdacf65e9f9 (patch) | |
| tree | 1963306aa58b486428c8c12e59380fbd67bf386b | |
| parent | 22613d3eda42ca065734d99fff59e4b4250ad660 (diff) | |
CM init work
Issue-ID: AAF-420
Change-Id: I79543d99b8d13bc43f2de0dff2d61de570331957
Signed-off-by: Instrumental <jonathan.gathman@att.com>
| -rw-r--r-- | auth/docker/aaf.sh | 3 | ||||
| -rw-r--r-- | auth/docker/d.props.init | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/auth/docker/aaf.sh b/auth/docker/aaf.sh index 53b3d60e..c09e7b03 100644 --- a/auth/docker/aaf.sh +++ b/auth/docker/aaf.sh @@ -48,6 +48,9 @@ if [ "$(docker volume ls | grep aaf_config)" = "" ] && [ ${P12_LOAD} = "yes" ]; 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 + if [ -z "$CM_CA_LOCAL" ]; then + CM_CA_LOCAL="org.onap.aaf.auth.cm.ca.LocalCA,/opt/app/osaaf/local/org.osaaf.aaf.signer.p12;${AAF_SIGNER_ALIAS};enc:" + fi 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 diff --git a/auth/docker/d.props.init b/auth/docker/d.props.init index e114e018..0322cd67 100644 --- a/auth/docker/d.props.init +++ b/auth/docker/d.props.init @@ -16,7 +16,7 @@ AAF_ENV=DEV AAF_REGISTER_AS=$HOSTNAME LATITUDE= LONGITUDE= -# + # Initial AAF Certificate (not Generated) CADI_X509_ISSUERS="CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US" AAF_INITIAL_X509_P12= @@ -24,7 +24,8 @@ AAF_INITIAL_X509_PASSWORD= CADI_X509_ISSUERS= # CA info (leave blank unless functioning as CA) +CM_CA_LOCAL= AAF_SIGNER_P12= AAF_SIGNER_PASSWORD= -CM_CA_LOCAL= +AAF_SIGNER_ALIAS= |