| commit | 63509462aa391043866ae5798de4d1aa5f554016 | [log] [tgz] |
|---|---|---|
| author | Borislav Glozman <Borislav.Glozman@amdocs.com> | Tue Jun 04 07:03:36 2019 +0000 |
| committer | Gerrit Code Review <gerrit@onap.org> | Tue Jun 04 07:03:36 2019 +0000 |
| tree | c6049e8b4b06b32faddea50aa8764f8ffc339b91 | |
| parent | 8708f4fa1b1616fd6e124c35194becb6f7696a69 [diff] | |
| parent | 67d14fd15c6a6caaa76e47fcebe6b5c93d53f9ce [diff] |
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 --- a/kubernetes/multicloud/charts/multicloud-azure/values.yaml +++ b/kubernetes/multicloud/charts/multicloud-azure/values.yaml
@@ -24,7 +24,7 @@ ################################################################# # 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 --- 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 @@ 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 --- a/kubernetes/so/resources/config/overrides/override.yaml +++ b/kubernetes/so/resources/config/overrides/override.yaml
@@ -98,7 +98,7 @@ org: onap: so: - cloud-owner: onap + cloud-owner: CloudOwner adapters: network: encryptionKey: 07a7159d3bf51a0e53be7a8f89699be7