summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvv770d <vv770d@att.com>2020-08-07 17:50:11 +0000
committervv770d <vv770d@att.com>2020-08-07 17:56:38 +0000
commitee9fec7bb76f914b31d62e917003bfdf6a42c00a (patch)
tree056c63d25517e7bd5e3136f814b2d55ff8cc5656
parent648ffe7aa810639dd6397b13aea28054647d6710 (diff)
Disable TCA/cdap from bootstrap2.0.3
Change-Id: Ib14ef5dc437ccff368a0e266f00530d1c949d641 Signed-off-by: vv770d <vv770d@att.com> Issue-ID: DCAEGEN2-2342
-rw-r--r--blueprints/k8s-tcagen2-clampnode.yaml4
-rw-r--r--blueprints/k8s-tcagen2.yaml2
-rw-r--r--pom.xml2
-rwxr-xr-xscripts/bootstrap.sh3
-rw-r--r--version.properties2
5 files changed, 6 insertions, 7 deletions
diff --git a/blueprints/k8s-tcagen2-clampnode.yaml b/blueprints/k8s-tcagen2-clampnode.yaml
index d988570..a31fd88 100644
--- a/blueprints/k8s-tcagen2-clampnode.yaml
+++ b/blueprints/k8s-tcagen2-clampnode.yaml
@@ -54,13 +54,13 @@ inputs:
default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.VES_MEASUREMENT_OUTPUT"
tca_handle_out_publish_url:
type: string
- default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.TCAGEN2-OUTPUT"
+ default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.DCAE_CL_OUTPUT"
tca_consumer_group:
type: string
default: "cg1"
policy_model_id:
type: string
- default: "onap.policies.monitoring.cdap.tca.hi.lo.app"
+ default: "onap.policies.monitoring.tcagen2"
policy_id:
type: string
default: "onap.restart.tca"
diff --git a/blueprints/k8s-tcagen2.yaml b/blueprints/k8s-tcagen2.yaml
index 02ece31..bcf98b6 100644
--- a/blueprints/k8s-tcagen2.yaml
+++ b/blueprints/k8s-tcagen2.yaml
@@ -50,7 +50,7 @@ inputs:
default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.VES_MEASUREMENT_OUTPUT"
tca_handle_out_publish_url:
type: string
- default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.TCAGEN2-OUTPUT"
+ default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.DCAE_CL_OUTPUT"
tca_consumer_group:
type: string
default: "cg1"
diff --git a/pom.xml b/pom.xml
index d63687a..0e59641 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<groupId>org.onap.dcaegen2.deployments</groupId>
<artifactId>k8s-bootstrap-container</artifactId>
<name>dcaegen2-deployments-k8s-bootstrap-container</name>
- <version>2.0.2-SNAPSHOT</version>
+ <version>2.0.3-SNAPSHOT</version>
<url>http://maven.apache.org</url>
<packaging>pom</packaging>
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index ff953cf..9cd69c8 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -155,8 +155,7 @@ set +e
deploy pgaas_initdb k8s-pgaas-initdb.yaml k8s-pgaas-initdb-inputs.yaml
# Deploy service components
-# tca, ves, prh, hv-ves, datafile-collector can be deployed simultaneously
-deploy tca k8s-tca.yaml k8s-tca-inputs.yaml &
+# tcagen2, ves, prh, hv-ves, datafile-collector can be deployed simultaneously
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 &
diff --git a/version.properties b/version.properties
index a75c90e..214049a 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
major=2
minor=0
-patch=2
+patch=3
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT