From c3aa7ebbb6f17c93958103077614f5bdac9837b0 Mon Sep 17 00:00:00 2001
From: Dileep Ranganathan <dileep.ranganathan@intel.com>
Date: Fri, 12 Oct 2018 02:29:49 -0700
Subject: Enable SMS in OSDF

Load secrets from SMS in OSDF.
Removed secrets from osdf_config.yaml.
Unit tests to use the test/config/osdf_config.yaml.
Helm charts uses a Job to load secrets.
CSIT needs to load it using the preload tool provided by SMS.

Change-Id: I0f832033476c02958f6392abba74e4d5a36cc902
Issue-ID: OPTFRA-343
Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
---
 config/osdf_config.yaml | 47 ++++-------------------------------------------
 1 file changed, 4 insertions(+), 43 deletions(-)

(limited to 'config/osdf_config.yaml')

diff --git a/config/osdf_config.yaml b/config/osdf_config.yaml
index d78f227..8c6d9f1 100755
--- a/config/osdf_config.yaml
+++ b/config/osdf_config.yaml
@@ -10,14 +10,8 @@ placementDefaultMajorVersion: "1"
 placementDefaultMinorVersion: "0"
 placementDefaultPatchVersion: "0"
 
-# Credentials for SO
-soUsername: ""   # SO username for call back.
-soPassword: ""   # SO password for call back.
-
-# Credentials for Conductor
+# Config for Conductor
 conductorUrl: http://172.17.0.6: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
 # versions to be set in HTTP header
@@ -26,39 +20,16 @@ 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
-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
+# Config for DMaaP
 messageReaderHosts: NA
 messageReaderTopic: NA
-messageReaderAafUserId: NA
-messageReaderAafPassword: NA
 
-# Credentials for SDC
+# Config for SDC
 sdcUrl: NA
-sdcUsername: NA
-sdcPassword: NA
 sdcONAPInstanceID: NA
 
-# Credentials for the OOF placement service - Generic
-osdfPlacementUsername: test
-osdfPlacementPassword: testpwd
-
-# Credentials for the OOF placement service - SO
-osdfPlacementSOUsername: so_test
-osdfPlacementSOPassword: so_testpwd
-
-# Credentials for the OOF placement service - VFC
-osdfPlacementVFCUsername: vfc_test
-osdfPlacementVFCPassword: vfc_testpwd
-
-# Credentials for the OOF CM scheduling service - Generic
-osdfCMSchedulerUsername: test1
-osdfCMSchedulerPassword: testpwd1
-
+# AAF Authentication config
 is_aaf_enabled: False
 aaf_cache_expiry_hrs: 3
 aaf_url: https://aaftest.simpledemo.onap.org:8095
@@ -73,15 +44,5 @@ aaf_ca_certs: ssl_certs/aaf_root_ca.cer
 
 # config db api
 configDbUrl: http://config.db.url:8080
-configDbUserName: osdf
-configDbPassword: passwd
 configDbGetCellListUrl: 'SDNCConfigDBAPI/getCellList'
 configDbGetNbrListUrl: 'SDNCConfigDBAPI/getNbrList'
-
-# Credentials for PCIHandler
-pciHMSUsername: ""   # pcihandler username for call back.
-pciHMSPassword: ""   # pcihandler password for call back.
-
-# Credentials for the OOF PCI Opt service
-osdfPCIOptUsername: pci_test
-osdfPCIOptPassword: pci_testpwd
-- 
cgit 1.2.3-korg