Remove legacy certificate handling

[sdc.git] / catalog-be / src / main / resources / config / configuration.yaml

diff --git a/catalog-be/src/main/resources/config/configuration.yaml b/catalog-be/src/main/resources/config/configuration.yaml
index 820034e..8c8ca1c 100644 (file)
--- a/catalog-be/src/main/resources/config/configuration.yaml
+++ b/catalog-be/src/main/resources/config/configuration.yaml
@@ -129,8 +129,6 @@ cassandraConfig:
     username: asdc_user
     password: Aa1234%^!
     ssl: true
-    truststorePath : /var/lib/jetty/opt/base/be/config/.truststore
-    truststorePassword : Aa123456
     maxWaitSeconds: 120
     keySpaces:
         - { name: dox, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['DC-sdc-iltlv650', '1']}
@@ -817,8 +815,6 @@ dmaapConsumerConfiguration:
         password: XyCUPhFx9u70aklYGo6OiA==
     aftDme2SslEnable: true
     aftDme2ClientIgnoreSslConfig: false
-    aftDme2ClientKeystore: /var/lib/jetty/opt/base/be/config/.truststore
-    aftDme2ClientKeystorePassword: XyCUPhFx9u70aklYGo6OiA==
     aftDme2ClientSslCertAlias: certman
 
 #Performence microservice dmaap producer
@@ -851,8 +847,6 @@ dmaapProducerConfiguration:
         password: XyCUPhFx9u70aklYGo6OiA==
         aftDme2SslEnable: true
     aftDme2ClientIgnoreSslConfig: false
-    aftDme2ClientKeystore: /var/lib/jetty/opt/jetty/base/be/config/.truststore
-    aftDme2ClientKeystorePassword: XyCUPhFx9u70aklYGo6OiA==
     aftDme2ClientSslCertAlias: certman
 
 
@@ -895,28 +889,6 @@ healthStatusExclude:
    - DMAAP_PRODUCER
    - ECOMP_PORTAL
 
-aafNamespace: com.att.sdc
-
-aafAuthNeeded: false
-
-cadiFilterParams:
-    hostname: 192.168.33.10
-    csp_domain: PROD
-    cadi_keyfile: /var/lib/jetty/opt/base/be/config/catalog-be/keyfile
-    cadi_loglevel: DEBUG
-    cadi_truststore: /var/lib/jetty/opt/base/be/config/.truststore
-    cadi_truststore_password: enc:XyCUPhFx9u70aklYGo6OiA==
-    #aaf_url: https://aaf.onap.org/service=?
-    aaf_id: aaf@sdc.onap.org
-    aaf_password: enc:XyCUPhFx9u70aklYGo6OiA==
-    aaf_env: DEV
-    aafLocateUrl: https://aaf.api.simpledemo.onap.org:8095
-    aaf_url: https://AAF_LOCATE_URL/AAF_NS.service:2.0
-    AFT_LATITUDE: "32.780140"
-    AFT_LONGITUDE: "-96.800451"
-    AFT_ENVIRONMENT: AFTUAT
-    cadiX509Issuers: "CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US"
-
 # This configuration entry lists all node type names prefix that shall be allowed on SDC.
 definedResourceNamespace:
   - org.openecomp.resource.