Merge "Add new docker images found in OOM"

diff --git a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh
index 9e70da6..05b7e24 100644 (file)
--- a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh
+++ b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh
@@ -261,7 +261,7 @@ helm repo list
 make all
 rsync -avt ~/oom/kubernetes/helm/plugins ~/.helm/
 helm search -l | grep local
-helm deploy dev local/onap -f ~/integration-override.yaml --namespace onap | tee ~/helm-deploy.log
+helm deploy dev local/onap -f ~/oom/kubernetes/onap/resources/environments/public-cloud.yaml -f ~/integration-override.yaml --namespace onap | tee ~/helm-deploy.log
 helm list
 
 

diff --git a/version-manifest/src/main/resources/docker-manifest-staging.csv b/version-manifest/src/main/resources/docker-manifest-staging.csv
index 2b360f7..9138b72 100644 (file)
--- a/version-manifest/src/main/resources/docker-manifest-staging.csv
+++ b/version-manifest/src/main/resources/docker-manifest-staging.csv
@@ -33,10 +33,10 @@ onap/clamp-dashboard-kibana,3.0-STAGING-latest
 onap/clamp-dashboard-logstash,3.0-STAGING-latest
 onap/cli,2.0.2
 onap/data-router,1.3-STAGING-latest
-onap/dmaap/buscontroller,1.0.19
+onap/dmaap/buscontroller,1.0.22
 onap/dmaap/datarouter-node,latest
 onap/dmaap/datarouter-prov,latest
-onap/dmaap/dmaap-mr,1.1.6
+onap/dmaap/dmaap-mr,1.1.8
 onap/dmaap/kafka01101,0.0.1
 onap/externalapi/nbi,3.0.0-latest
 onap/fproxy,2.1-STAGING-latest

diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv
index 57118a8..eec4a2a 100644 (file)
--- a/version-manifest/src/main/resources/docker-manifest.csv
+++ b/version-manifest/src/main/resources/docker-manifest.csv
@@ -29,10 +29,10 @@ onap/clamp-dashboard-kibana,3.0.0
 onap/clamp-dashboard-logstash,3.0.0
 onap/cli,2.0.2
 onap/data-router,1.3.0
-onap/dmaap/buscontroller,1.0.12
+onap/dmaap/buscontroller,1.0.22
 onap/dmaap/datarouter-node,1.0.2
 onap/dmaap/datarouter-prov,1.0.2
-onap/dmaap/dmaap-mr,1.1.4
+onap/dmaap/dmaap-mr,1.1.7
 onap/externalapi/nbi,3.0.1
 onap/gizmo,1.3.0
 onap/holmes/engine-management,1.2.0