X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fso%2Fcomponents%2Fso-openstack-adapter%2Fresources%2Fconfig%2Foverrides%2Foverride.yaml;h=287c9537b62ce696e5ccbe6ac29f218fe305137e;hb=refs%2Fheads%2Fmaster;hp=bc556c5d474ba817a2b4f3f2c86a383f6965fd0b;hpb=6e80ecd2a6aeacf645f73f06d70d7947fc0f97d2;p=oom.git

diff --git a/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml
index bc556c5d47..287c9537b6 100755
--- a/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml
@@ -1,3 +1,4 @@
+{{/*
 # Copyright © 2018 AT&T USA
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,11 +12,16 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+*/}}
 aai:
-  auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.aai.auth )}}
-  endpoint: https://aai.{{ include "common.namespace" . }}:8443
+  auth: {{ .Values.aai.auth }}
+  endpoint: http://aai.{{ include "common.namespace" . }}:80
 server:
+  {{- if include "common.onServiceMesh" . }}
+  forward-headers-strategy: none
+  {{- end }}
   port: {{ index .Values.containerPort }}
+SW  port: {{ index .Values.containerPort }}
 spring:
   datasource:
     hikari:
@@ -55,10 +61,14 @@ org:
   onap:
     so:
       adapters:
+        {{- if eq .Values.config.openStackKeystoneVersion "KEYSTONE_V3" }}
+        default_keystone_url_version: /v3
+        {{- else }}
         default_keystone_url_version: /v2.0
+        {{- end }}
         default_keystone_reg_ex: "/[vV][0-9]"
         vnf:
-          bpelauth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.org.onap.so.adapters.bpelauth )}}
+          bpelauth: {{ .Values.org.onap.so.adapters.bpelauth }}
           checkRequiredParameters: true
           addGetFilesOnVolumeReq: false
           sockettimeout: 30
@@ -69,7 +79,7 @@ org:
           valet_enabled: false
           fail_requests_on_valet_failure: false
         network:
-          bpelauth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.org.onap.so.adapters.bpelauth )}}
+          bpelauth: {{ .Values.org.onap.so.adapters.bpelauth }}
           sockettimeout: 5
           connecttimeout: 5
           retrycount: 5
@@ -77,7 +87,11 @@ org:
           retrylist: 408,429,500,502,503,504,900
           encryptionKey: 07a7159d3bf51a0e53be7a8f89699be7
         tenant:
+          {{- if eq .Values.config.openStackKeystoneVersion "KEYSTONE_V3" }}
+          default_keystone_url_version: /v3
+          {{- else }}
           default_keystone_url_version: /v2.0
+          {{- end }}
           default_keystone_reg_ex: "/[vV][0-9]"
           default_tenant_description: Tenant
           default_region_type: single
@@ -95,32 +109,30 @@ ecomp:
         retryCount: 3
         pollTimeout: 7500
         pollInterval: 15
+multicloud:
+  endpoint: http://multicloud-k8s.{{ include "common.namespace" . }}:9015
 mso:
   adapters:
     requestDb:
       endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083
-      auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.mso.db.auth )}}
-  auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.aaf.auth.encrypted "value2" .Values.mso.auth )}}
+      auth: {{ .Values.mso.db.auth }}
+  auth: {{ .Values.mso.auth }}
   logPath: ./logs/openstack
   msb-ip: msb-iag
-  msb-port: 443
-  msb-scheme: https
+  msb-port: 80
+  msb-scheme: http
   workflow:
     endpoint: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/sobpmnengine
   msoKey: {{ .Values.mso.msoKey }}
   config:
-    {{ if eq .Values.global.security.aaf.enabled true }}
-    cadi: {{ include "so.cadi.keys" . | nindent 8}}
-    {{- else }}
     cadi:
       aafId: {{ .Values.mso.basicUser }}
-    {{- end }}
   catalog:
     db:
       spring:
         endpoint: http://so-catalog-db-adapter.{{ include "common.namespace" . }}:8082
   db:
-    auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.encrypted "value2" .Values.mso.db.auth )}}
+    auth: {{ .Values.mso.db.auth }}
   site-name: localDevEnv
   async:
     core-pool-size: 50