Merge "Updated certificates for SMS"

diff --git a/kubernetes/multicloud/charts/multicloud-azure/values.yaml b/kubernetes/multicloud/charts/multicloud-azure/values.yaml
index 83d600e..131c8c9 100644 (file)
--- a/kubernetes/multicloud/charts/multicloud-azure/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-azure/values.yaml
@@ -24,7 +24,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/multicloud/azure:1.2.2
+image: onap/multicloud/azure:1.2.4
 pullPolicy: Always
 
 #Istio sidecar injection policy

diff --git a/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml
index 13b7271..62351b8 100755 (executable)
--- a/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-openstack-adapter/resources/config/overrides/override.yaml
@@ -13,6 +13,7 @@
 # limitations under the License.
 aai:
   auth: 2A11B07DB6214A839394AA1EC5844695F5114FC407FF5422625FB00175A3DCB8A1FF745F22867EFA72D5369D599BBD88DA8BED4233CF5586
+  endpoint: https://aai.{{ include "common.namespace" . }}:8443
 server:
   port: {{ index .Values.containerPort }}
 spring:
@@ -101,8 +102,6 @@ mso:
     db:
       spring:
         endpoint: http://so-catalog-db-adapter.{{ include "common.namespace" . }}:8082
-  aai:
-    endpoint: https://aai.{{ include "common.namespace" . }}:8443
   db:
     auth: Basic YnBlbDpwYXNzd29yZDEk
   site-name: localDevEnv

diff --git a/kubernetes/so/resources/config/overrides/override.yaml b/kubernetes/so/resources/config/overrides/override.yaml
index b5b4f35..143a594 100755 (executable)
--- a/kubernetes/so/resources/config/overrides/override.yaml
+++ b/kubernetes/so/resources/config/overrides/override.yaml
@@ -98,7 +98,7 @@ request:
 org:
   onap:
     so:
-      cloud-owner: onap
+      cloud-owner: CloudOwner
       adapters:
         network:
           encryptionKey: 07a7159d3bf51a0e53be7a8f89699be7