From: MukeshKumar <mukeshsharma@est.tech>
Date: Thu, 29 Oct 2020 16:35:45 +0000 (+0000)
Subject: [SO] SOL003 adapter,bpmn-infra, nfvo HTTPs to HTTP
X-Git-Tag: 7.0.0~35^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2ce12fe934db88f41e61a46c6a45bb8f16f2ac5f;p=oom.git

[SO] SOL003 adapter,bpmn-infra, nfvo HTTPs to HTTP

Removing https communication as SO SOL003 Adapter has used its own keystore for communications with bpmn-infra and etsi-nfvo
with hardcoded password.Common way of certicates will break existing communication so going for HTTP path due to time constraint .
Will revisit security in Honululu as part of https://jira.onap.org/browse/SO-3350 epic.

Change-Id: I521d9be9007f229919fb5d88f476a692faae10e1
Issue-ID: SO-3349
Signed-off-by: Mukesh <mukeshsharma@est.tech>
---

diff --git a/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml b/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
index cf448cc9cd..11128dd68c 100755
--- a/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
@@ -382,7 +382,7 @@ spring:
 so:
   vnfm:
     adapter:
-      url: https://so-vnfm-adapter.{{ include "common.namespace" . }}:9092/so/vnfm-adapter/v1/
+      url: http://so-vnfm-adapter.{{ include "common.namespace" . }}:9092/so/vnfm-adapter/v1/
       auth: {{ .Values.so.vnfm.adapter.auth }}
 org:
   onap:
diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml
index 7b85b445a2..20a4284c67 100644
--- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/resources/config/overrides/override.yaml
@@ -49,7 +49,7 @@ mso:
 so:
   adapters:
     sol003-adapter:
-      url: https://so-vnfm-adapter.{{ include "common.namespace" . }}:9092/so/vnfm-adapter/v1
+      url: http://so-vnfm-adapter.{{ include "common.namespace" . }}:9092/so/vnfm-adapter/v1
       auth: {{ .Values.so.sol003.adapter.auth }}
 etsi-catalog-manager:
   base:
diff --git a/kubernetes/so/components/so-vnfm-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-vnfm-adapter/resources/config/overrides/override.yaml
index 9d98803c8e..d780a76876 100755
--- a/kubernetes/so/components/so-vnfm-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-vnfm-adapter/resources/config/overrides/override.yaml
@@ -29,15 +29,7 @@ spring:
 server:
   port: {{ index .Values.containerPort }}
   ssl:
-    key-alias: so@so.onap.org
-    key-store-password: ${KEYSTORE_PASSWORD}
-    key-store: file:${KEYSTORE}
-    key-store-type: PKCS12
-http:
-  client:
-    ssl:
-      trust-store: file:${TRUSTSTORE}
-      trust-store-password: ${TRUSTSTORE_PASSWORD}
+    enabled: false
 mso:
   key: {{ .Values.mso.key }}
   site-name: localSite
@@ -52,7 +44,7 @@ sdc:
   key: {{ .Values.sdc.key }}
   endpoint: https://sdc-be.{{ include "common.namespace" . }}:8443
 vnfmadapter:
-  endpoint: https://so-vnfm-adapter.{{ include "common.namespace" . }}:9092
+  endpoint: http://so-vnfm-adapter.{{ include "common.namespace" . }}:9092
 etsi-catalog-manager:
   vnfpkgm:
   {{- if .Values.global.msbEnabled }}