diff options
| author |   Michael Mokry <michael.mokry@att.com> | 2018-10-30 16:51:57 -0500 |
|---|---|---|
| committer | Michael Mokry <michael.mokry@att.com> | 2018-11-02 20:04:37 +0000 |
| commit | 76088485005347db7495a735fffa650ddd479c50 (patch) | |
| tree | 12688e4b4a75446c3f2a0a21da987d5a19aa240a /packages | |
| parent | 45f5559fd72ea7cc0ed9932ee617ac19d8569769 (diff) | |
Modified to make AAF configurable in policy/engine
Added property to enable or disable AAF
Added logic to the code to check the property and use old authentication
logic to authenticate the user rather than AAF if disabled.
Fixed license issue
Modified cadi_truststore_password value to use proper variable
Added comment to local development enviroment properties file
Modified test resources to fix Junit failures
Change-Id: I962895154716092c9cc0bc6c48f6419f3b5900fe
Issue-ID: POLICY-1217
Signed-off-by: Michael Mokry <michael.mokry@att.com>
(cherry picked from commit 6accdc2ae0340ed84a59c739bd345ced2ff323c5)
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/base/src/files/install/servers/pdp/bin/xacml.pdp.properties | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/base/src/files/install/servers/pdp/bin/xacml.pdp.properties b/packages/base/src/files/install/servers/pdp/bin/xacml.pdp.properties index ad27cd09e..315fb4d67 100644 --- a/packages/base/src/files/install/servers/pdp/bin/xacml.pdp.properties +++ b/packages/base/src/files/install/servers/pdp/bin/xacml.pdp.properties @@ -137,6 +137,7 @@ ENVIRONMENT=${{ENVIRONMENT}} xacml.rest.pep.idfile = client.properties #AAF cadi properties +enable_aaf=false policy.aaf.namespace = ${{AAF_NAMESPACE}} policy.aaf.root.permission=${{AAF_NAMESPACE}}.pdpx cm_url=https://${{AAF_HOST}}:8095/AAF_NS.cm:2.1 @@ -150,6 +151,8 @@ cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_ cadi_keystore=${{POLICY_HOME}}/etc/ssl/policy-keystore cadi_keystore_password=${{KEYSTORE_PASSWD}} cadi_key_password=${{KEYSTORE_PASSWD}} +cadi_truststore=${{POLICY_HOME}}/etc/ssl/policy-truststore +cadi_truststore_password=${{TRUSTSTORE_PASSWD}} aaf_env=DEV aaf_url=https://${{AAF_HOST}}:8095/AAF_NS.service:2.1 aaf_fqdn=${{AAF_HOST}} |