From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Fri, 6 Nov 2020 08:39:20 +0000 (+0000)
Subject: Merge "[SO] SOL003 adapter,bpmn-infra, nfvo HTTPs to HTTP"
X-Git-Tag: 7.0.0~35
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c1f76565d190ad585454ac01d237e880ea200404;hp=2346cfe6b0187d9d2927c3e397aa25359a45575c;p=oom.git

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

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 }}