Update blueprints, plugins, and bootstrap script.

Stop deploying snmptrap collector
Move to tca-cdap-container 1.2.2
Move to k8splugin 1.7.2

Issue-ID: DCAEGEN2-2037
Issue-ID: DCAEGEN2-2021
Issue-ID: DCAEGEN2-2006
Signed-off-by: Jack Lucas <jflucas@research.att.com>
Change-Id: Icd09d65b2be83d786dd2bd669d627a1cb6242119

diff --git a/k8s-bootstrap-container/bootstrap.sh b/k8s-bootstrap-container/bootstrap.sh
index b23e908..09767c6 100755 (executable)
--- a/k8s-bootstrap-container/bootstrap.sh
+++ b/k8s-bootstrap-container/bootstrap.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # ================================================================================
-# Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018-2020 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.
@@ -142,15 +142,6 @@ set -e
 
 # Consul service registration data
 CBS_REG='{"ID": "dcae-cbs0", "Name": "config_binding_service", "Address": "config-binding-service", "Port": 10000}'
-CBS_REG1='{"ID": "dcae-cbs1", "Name": "config-binding-service", "Address": "config-binding-service", "Port": 10000}'
-HE_REG='{"ID": "dcae-he0", "Name": "holmes-engine-mgmt", "Address": "holmes-engine-mgmt", "Port": 9102}'
-HR_REG='{"ID": "dcae-hr0", "Name": "holmes-rule-mgmt", "Address": "holmes-rule-mgmt", "Port": 9101}'
-PH_REG='{"ID": "dcae-ph0", "Name": "policy_handler", "Port": 25577, "Address": "policy-handler'
-if [ ! -z "${DCAE_NAMESPACE}" ]
-then
-       PH_REG="${PH_REG}.${DCAE_NAMESPACE}"
-fi
-PH_REG="${PH_REG}\"}"
 
 # Set up profile to access Cloudify Manager
 cfy profiles use -u admin -t default_tenant -p "${CMPASS}" ${CFYTLS} "${CMADDR}"
@@ -189,7 +180,7 @@ do
 done
 
 # Put service registrations into the local Consul configuration directory
-for sr in CBS_REG CBS_REG1 HE_REG HR_REG PH_REG
+for sr in CBS_REG
 do
   echo '{"service" : ' ${!sr}  ' }'> /opt/consul/config/${sr}.json
 done
@@ -227,7 +218,6 @@ deploy pgaas_initdb k8s-pgaas-initdb.yaml k8s-pgaas-initdb-inputs.yaml
 # tca, ves, prh, hv-ves, datafile-collector can be deployed simultaneously
 deploy tca k8s-tca.yaml k8s-tca-inputs.yaml &
 deploy ves k8s-ves.yaml k8s-ves-inputs.yaml &
-deploy snmptrap k8s-snmptrap.yaml k8s-snmptrap-inputs.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

diff --git a/k8s-bootstrap-container/load-blueprints.sh b/k8s-bootstrap-container/load-blueprints.sh
index 0947c7e..3784d84 100755 (executable)
--- a/k8s-bootstrap-container/load-blueprints.sh
+++ b/k8s-bootstrap-container/load-blueprints.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # ================================================================================
-# Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018-2020 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.
@@ -28,7 +28,6 @@ k8s-holmes-rules.yaml \
 k8s-pgaas-initdb.yaml \
 k8s-tca.yaml \
 k8s-ves.yaml \
-k8s-snmptrap.yaml \
 k8s-prh.yaml \
 k8s-hv-ves.yaml \
 k8s-helm-override.yaml \

diff --git a/k8s-bootstrap-container/load-plugins.sh b/k8s-bootstrap-container/load-plugins.sh
index aa5424d..c67258e 100755 (executable)
--- a/k8s-bootstrap-container/load-plugins.sh
+++ b/k8s-bootstrap-container/load-plugins.sh
@@ -2,7 +2,7 @@
 # ============LICENSE_START=======================================================
 # org.onap.dcae
 # ================================================================================
-# Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018-2020 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.
@@ -31,7 +31,7 @@ DEST=wagons
 # For DCAE, starting in R5, we pull down wagons directly
 DCAEPLUGINFILES=\
 "\
-k8splugin/1.7.1/k8splugin-1.7.1-py27-none-linux_x86_64.wgn
+k8splugin/1.7.2/k8splugin-1.7.2-py27-none-linux_x86_64.wgn
 relationshipplugin/1.1.0/relationshipplugin-1.1.0-py27-none-linux_x86_64.wgn
 clamppolicyplugin/1.1.0/clamppolicyplugin-1.1.0-py27-none-linux_x86_64.wgn
 dcaepolicyplugin/2.4.0/dcaepolicyplugin-2.4.0-py27-none-linux_x86_64.wgn \

diff --git a/k8s-bootstrap-container/pom.xml b/k8s-bootstrap-container/pom.xml
index 1adaa7b..4c201cc 100644 (file)
--- a/k8s-bootstrap-container/pom.xml
+++ b/k8s-bootstrap-container/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 ================================================================================
-Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
+Copyright (c) 2018-2020 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.
@@ -27,7 +27,7 @@ limitations under the License.
   <groupId>org.onap.dcaegen2.deployments</groupId>
   <artifactId>k8s-bootstrap-container</artifactId>
   <name>dcaegen2-deployments-k8s-bootstrap-container</name>
-  <version>1.7.0</version>
+  <version>1.8.0</version>
   <url>http://maven.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>