diff options
| author |   Instrumental <jonathan.gathman@att.com> | 2018-07-16 18:41:10 -0500 |
|---|---|---|
| committer | Instrumental <jonathan.gathman@att.com> | 2018-07-16 18:42:18 -0500 |
| commit | 9c8a8b0926b13b07fb1e5394903401e7a3f1ff79 (patch) | |
| tree | 29d65b58d4ebfc79e8d91752133c85d48699b71d /auth/sample/local | |
| parent | 4ad4763d8c9191998cc671a884d1af5da6ba8bb9 (diff) | |
Changes from Testing AAF Config
Issue-ID: AAF-378
Change-Id: Icca28ee4e76b8329c7e068ba9305f9f647b6e479
Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'auth/sample/local')
| -rw-r--r-- | auth/sample/local/.gitignore | 0 | ||||
| -rw-r--r-- | auth/sample/local/aaf.props | 5 | ||||
| -rw-r--r-- | auth/sample/local/initialConfig.props | 2 | ||||
| -rw-r--r-- | auth/sample/local/org.osaaf.aaf.cm.ca.props | 4 |
4 files changed, 4 insertions, 7 deletions
diff --git a/auth/sample/local/.gitignore b/auth/sample/local/.gitignore deleted file mode 100644 index e69de29b..00000000 --- a/auth/sample/local/.gitignore +++ /dev/null diff --git a/auth/sample/local/aaf.props b/auth/sample/local/aaf.props index 8237c4e9..c9fb8f98 100644 --- a/auth/sample/local/aaf.props +++ b/auth/sample/local/aaf.props @@ -11,12 +11,11 @@ aaf_default_realm=people.osaaf.org # Initial Passwords and such aaf_password=startup -cadi_alias=osaaf@aaf.osaaf.org +cadi_alias=aaf@aaf.osaaf.org cadi_keystore=/opt/app/osaaf/local/org.osaaf.aaf.p12 -cadi_keystore_password=kumquat cadi_truststore=/opt/app/osaaf/public/truststoreONAPall.jks cadi_truststore_password=changeit +cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US # Other aaf_data_dir=/opt/app/osaaf/data -cadi_registration_hostname=meriadoc.mithril.sbc.com diff --git a/auth/sample/local/initialConfig.props b/auth/sample/local/initialConfig.props index f9ad077a..13704244 100644 --- a/auth/sample/local/initialConfig.props +++ b/auth/sample/local/initialConfig.props @@ -1,10 +1,8 @@ -aaf_env=DEV
aaf_locate_url=https://aaf-onap-test.osaaf.org:8095
aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/AAF_NS.introspect:2.1/introspect
aaf_oauth2_token_url=https://AAF_LOCATE_URL/AAF_NS.token:2.1/token
aaf_url=https://AAF_LOCATE_URL/AAF_NS.service:2.1
cadi_protocols=TLSv1.1,TLSv1.2
-cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US
cm_url=https://AAF_LOCATE_URL/AAF_NS.cm:2.1
fs_url=https://AAF_LOCATE_URL/AAF_NS.fs.2.1
gui_url=https://AAF_LOCATE_URL/AAF_NS.gui.2.1
diff --git a/auth/sample/local/org.osaaf.aaf.cm.ca.props b/auth/sample/local/org.osaaf.aaf.cm.ca.props index 92d55f92..5c692f4b 100644 --- a/auth/sample/local/org.osaaf.aaf.cm.ca.props +++ b/auth/sample/local/org.osaaf.aaf.cm.ca.props @@ -1,10 +1,10 @@ ## ## org.osaaf.cm.ca.props -## Properties to access Certifiate Authority +## Properties to access Certificate Authority ## #Certman -cm_ca.local=org.onap.aaf.auth.cm.ca.LocalCA,/opt/app/osaaf/local/aaf_intermediate_1.p12;aaf_intermediate_1;enc: +cm_ca.local=org.onap.aaf.auth.cm.ca.LocalCA,/opt/app/osaaf/local/org.osaaf.aaf.signer.p12;aaf_intermediate_7;enc: cm_ca.local.idDomains=org.osaaf cm_ca.local.baseSubject=/OU=OSAAF/O=ONAP/C=US cm_ca.local.perm_type=org.osaaf.aaf.ca |