aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnkitkumar Patel <ankit@research.att.com>2018-04-24 23:42:08 -0400
committerAnkitkumar Patel <ankit@research.att.com>2018-04-24 23:53:11 -0400
commit72cd5fb92fb7afbfe7e0bfe7590d7bb9ecf995d9 (patch)
tree3e36a7ade4292506c48ff61b818a64049c30b6e0
parent955c99d8c51ef7c10cf6e1d0e429d15d8ea59305 (diff)
Updated the configuration
Updated the configurations of policy, so, and conductor. Issue-ID: OPTFRA-222 Change-Id: I8500cd333d3bd24ebc8fc59db1c74a5b58b76854 Signed-off-by: Ankitkumar Patel <ankit@research.att.com>
-rw-r--r--config/common_config.yaml2
-rwxr-xr-xconfig/osdf_config.yaml54
2 files changed, 32 insertions, 24 deletions
diff --git a/config/common_config.yaml b/config/common_config.yaml
index 67fd8be..5790042 100644
--- a/config/common_config.yaml
+++ b/config/common_config.yaml
@@ -5,7 +5,7 @@ osdf_system:
external: 8698 # clients use this port on DockerHost
osdf_ip_default: 0.0.0.0
# # Important Note: At deployment time, we need to ensure the port mapping is done
-# ssl_context: ['./../etc/sniromanager.crt', './../etc/sniromanager.key']
+# ssl_context: ['./../etc/osdf_aaf.crt', './../etc/osdf_aaf.key']
osdf_temp: # special configuration required for "workarounds" or testing
local_policies:
diff --git a/config/osdf_config.yaml b/config/osdf_config.yaml
index 69ebdf0..1a20d3c 100755
--- a/config/osdf_config.yaml
+++ b/config/osdf_config.yaml
@@ -1,34 +1,42 @@
-osdfUserNameForSO: "" # The OSDF Manager username for MSO.
-odfPasswordForSO: "" # The OSDF Manager password for MSO.
-
-# msoUrl: "" # The SO url for call back. This will be part of the request, so no need
+# Credentials for SO
soUsername: "" # SO username for call back.
soPassword: "" # SO password for call back.
-conductorUrl: "https://OOF-HAS-CONDUCTOR-HOST:8091"
-conductorUsername: "CONDUCTOR-USER"
-conductorPassword: "CONDUCTOR-PASSWD"
+# Credentials for Conductor
+conductorUrl: https://localhost:8091/v1/plans/
+conductorUsername: admin1
+conductorPassword: plan.15
conductorPingWaitTime: 60 # seconds to wait before calling the conductor retry URL
conductorMaxRetries: 30 # if we don't get something in 30 minutes, give up
# Policy Platform -- requires ClientAuth, Authorization, and Environment
-policyPlatformUrl: https://POLICY-URL:8081/pdp/getConfig # Policy Dev platform URL
+policyPlatformUrl: http://onap-pdp:8081/pdp/api/getConfig # Policy Dev platform URL
policyPlatformEnv: TEST # Environment for policy platform
-policyPlatformUsername: POLICY-USER # Policy platform username.
-policyPlatformPassword: POLICY-PASSWD # Policy platform password.
-policyClientUsername: POLICY-CLIENT-USER # For use with ClientAuth
-policyClientPassword: POLICY-CLIENT-PASSWD # For use with ClientAuth
+policyPlatformUsername: testpdp # Policy platform username.
+policyPlatformPassword: alpha123 # Policy platform password.
+policyClientUsername: python # For use with ClientAuth
+policyClientPassword: test # For use with ClientAuth
+
+# Credentials for DMaaP
+messageReaderHosts: NA
+messageReaderTopic: NA
+messageReaderAafUserId: NA
+messageReaderAafPassword: NA
+
+# Credentials for SDC
+sdcUrl: NA
+sdcUsername: NA
+sdcPassword: NA
+sdcONAPInstanceID: NA
-messageReaderHosts: https://DMAAP-HOST1:3905,https://DMAAP-HOST2:3905,https://DMAAP-HOST3:3905
-messageReaderTopic: org.onap.oof.osdf.multicloud
-messageReaderAafUserId: DMAAP-OSDF-MC-USER
-messageReaderAafPassword: DMAAP-OSDF-MC-PASSWD
+# Credentials for the OOF placement service - Generic
+osdfPlacementUsername: test
+osdfPlacementPassword: testpwd
-sdcUrl: https://SDC-HOST:8443/sdc/v1/catalog
-sdcUsername: SDC-OSDF-USER
-sdcPassword: SDC-OSDF-PASSWD
-sdcONAPInstanceID: ONAP-OSDF
+# Credentials for the OOF placement service - SO
+osdfPlacementSOUsername: so_test
+osdfPlacementSOPassword: so_testpwd
-osdfPlacementUrl: "http://127.0.0.1:24699/osdf/api/v2/placement"
-osdfPlacementUsername: "test"
-osdfPlacementPassword: "testpwd"
+# Credentials for the OOF CM scheduling service - Generic
+osdfCMSchedulerUsername: test1
+osdfCMSchedulerPassword: testpwd1 \ No newline at end of file