Merge "Add passthrough attributes"

[optf/osdf.git] / config / osdf_config.yaml

diff --git a/config/osdf_config.yaml b/config/osdf_config.yaml
index eac9883..6cf8cec 100755 (executable)
--- a/config/osdf_config.yaml
+++ b/config/osdf_config.yaml
@@ -17,11 +17,11 @@ conductorMaxRetries: 30  # if we don't get something in 30 minutes, give up
 # versions to be set in HTTP header
 conductorMinorVersion: 0
 
-# Policy Platform -- requires ClientAuth, Authorization, and Environment
-policyPlatformUrl: http://policy.api.simpledemo.onap.org:8081/pdp/api/getConfig # Policy Dev platform URL
-policyPlatformEnv: TEST  # Environment for policy platform
+# Policy Platform -- requires Authorization
+policyPlatformUrl: https://policy-xacml-pdp:6969/policy/pdpx/decision/v1 # Policy Dev platform URL
 # URL for policy model uploading
-policyPlatformUrlForModelUploading: http://policy.api.simpledemo.onap.org:8081/policy/api/v1/policytypes
+policyPlatformUrlModelUpload: https://policy.api.simpledemo.onap.org:8081/policy/api/v1/policytypes
+pathPolicyModelUpload: ../../models/policy/placement/tosca_upload/
 
 # Config for DMaaP
 messageReaderHosts: NA
@@ -33,10 +33,11 @@ sdcONAPInstanceID: NA
 
 # AAF Authentication config
 is_aaf_enabled: False
-aaf_cache_expiry_hrs: 3
+aaf_cache_expiry_mins: 5
 aaf_url: https://aaftest.simpledemo.onap.org:8095
 aaf_user_roles:
-    - /api/oof/v1/placement:org.onap.osdf.access|*|read ALL
+  - '/placement:org.onap.oof.access|*|read ALL'
+  - '/pci:org.onap.oof.access|*|read ALL'
 
 # Secret Management Service from AAF
 aaf_sms_url: https://aaf-sms.onap:10443
@@ -48,3 +49,6 @@ aaf_ca_certs: ssl_certs/aaf_root_ca.cer
 configDbUrl: http://config.db.url:8080
 configDbGetCellListUrl: 'SDNCConfigDBAPI/getCellList'
 configDbGetNbrListUrl: 'SDNCConfigDBAPI/getNbrList'
+
+pciHMSUsername: test
+pciHMSPassword: passwd
\ No newline at end of file