From: Brian Freeman <bf1936@att.com>
Date: Wed, 29 May 2019 21:59:11 +0000 (+0000)
Subject: Merge "Update to latest SDNC and CCSDK containers"
X-Git-Tag: 4.0.0-ONAP~50
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=fd4968101f8df17e8f1508ecfdf576ac36f0e60c;hp=c153af04d315308e9de04f44ba83c9fd551402d6;p=oom.git

Merge "Update to latest SDNC and CCSDK containers"
---

diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
index b30d440b39..ddfa00aa0b 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
@@ -90,16 +90,16 @@ postgres:
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:1.4.17
+image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:1.4.18
 default_k8s_location: central
 
 # DCAE component images to be deployed via Cloudify Manager
 # Use to override default setting in blueprints
 componentImages:
-  dashboard: onap/org.onap.ccsdk.dashboard.ccsdk-app-os:1.1.0-SNAPSHOT-latest
+  dashboard: onap/org.onap.ccsdk.dashboard.ccsdk-app-os:1.1.0
   holmes_rules: onap/holmes/rule-management:1.2.6
   holmes_engine: onap/holmes/engine-management:1.2.5
-  tca: onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.1
+  tca: onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.2
   ves: onap/org.onap.dcaegen2.collectors.ves.vescollector:1.4.4
   snmptrap: onap/org.onap.dcaegen2.collectors.snmptrap:1.4.0
   prh: onap/org.onap.dcaegen2.services.prh.prh-app-server:1.2.3
diff --git a/kubernetes/so/charts/so-sdc-controller/resources/config/overrides/override.yaml b/kubernetes/so/charts/so-sdc-controller/resources/config/overrides/override.yaml
index bee68e6470..f74ef8fe35 100755
--- a/kubernetes/so/charts/so-sdc-controller/resources/config/overrides/override.yaml
+++ b/kubernetes/so/charts/so-sdc-controller/resources/config/overrides/override.yaml
@@ -69,6 +69,8 @@ mso:
       messageBusAddress: message-router.{{ include "common.namespace" . }},message-router.{{ include "common.namespace" . }}
   asdc:
     config:
+      activity:
+        endpoint: http://sdc-wfd-be:8080
       key: 566B754875657232314F5548556D3665
       components:
         count: 3,