Merge "[DCAE] Disable holmes from boostrap"

4 files changed, 6 insertions, 8 deletions

diff --git a/Changelog.md b/Changelog.md
index aa2085e..68eb90c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [3.0.4] - 2021-03-10
          - [DCAEGEN2-2656](https://jira.onap.org/browse/DCAEGEN2-2656) - fix CRITICAL weak-cryptography issues identified in sonarcloud (hostname verification in DFC)
          - [DCAEGEN2-2659](https://jira.onap.org/browse/DCAEGEN2-2659) - PM-Mapper blueprint updated to 1.5.2 version (implement singleton cache for events being processed)
+         - [DCAEGEN2-2700](https://jira.onap.org/browse/DCAEGEN2-2700) - Disable Holmes deployment from bootstrap & container revision on blueprint
 
 ## [3.0.3] - 2021-02-18
 ### Changed
diff --git a/blueprints/k8s-holmes-engine.yaml b/blueprints/k8s-holmes-engine.yaml
index 87d7de8..82a4c4a 100644
--- a/blueprints/k8s-holmes-engine.yaml
+++ b/blueprints/k8s-holmes-engine.yaml
@@ -2,7 +2,7 @@
 #
 # ============LICENSE_START====================================================
 # =============================================================================
-# Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2017-2021 AT&T Intellectual Property. All rights reserved.
 # Copyright (c) 2020 Nokia Intellectual Property. All rights reserved.
 # =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -44,7 +44,7 @@ inputs:
     default: "holmes"
   he_image:
     type: string
-    default: "nexus3.onap.org:10001/onap/holmes/engine-management:1.2.9"
+    default: "nexus3.onap.org:10001/onap/holmes/engine-management:1.3.2"
   service_component_type:
     type: string
     default: "holmes-engine-mgmt"
diff --git a/blueprints/k8s-holmes-rules.yaml b/blueprints/k8s-holmes-rules.yaml
index c50c925..7a218c4 100644
--- a/blueprints/k8s-holmes-rules.yaml
+++ b/blueprints/k8s-holmes-rules.yaml
@@ -2,7 +2,7 @@
 #
 # ============LICENSE_START====================================================
 # =============================================================================
-# Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2017-2021 AT&T Intellectual Property. All rights reserved.
 # =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ inputs:
     default: "holmes"
   hr_image:
     type: string
-    default: "nexus3.onap.org:10001/onap/holmes/rule-management:1.2.9"
+    default: "nexus3.onap.org:10001/onap/holmes/rule-management:1.3.2"
   service_component_type:
     type: string
     default: "holmes-rule-mgmt"
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 8089439..035c62d 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # ================================================================================
-# Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018-2021 AT&T Intellectual Property. All rights reserved.
 # Copyright (c) 2021 J. F. Lucas. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -148,9 +148,6 @@ deploy tcagen2 k8s-tcagen2.yaml k8s-tcagen2-inputs.yaml &
 deploy ves-tls k8s-ves.yaml k8s-ves-inputs-tls.yaml &
 deploy prh k8s-prh.yaml k8s-prh-inputs.yaml &
 deploy hv-ves k8s-hv-ves.yaml k8s-hv_ves-inputs.yaml &
-# holmes_rules must be deployed before holmes_engine, but holmes_rules can go in parallel with other service components
-deploy holmes_rules k8s-holmes-rules.yaml k8s-holmes_rules-inputs.yaml
-deploy holmes_engine k8s-holmes-engine.yaml k8s-holmes_engine-inputs.yaml
 
 # Display deployments, for debugging purposes
 cfy deployments list