From ee9fec7bb76f914b31d62e917003bfdf6a42c00a Mon Sep 17 00:00:00 2001 From: vv770d Date: Fri, 7 Aug 2020 17:50:11 +0000 Subject: Disable TCA/cdap from bootstrap Change-Id: Ib14ef5dc437ccff368a0e266f00530d1c949d641 Signed-off-by: vv770d Issue-ID: DCAEGEN2-2342 --- blueprints/k8s-tcagen2-clampnode.yaml | 4 ++-- blueprints/k8s-tcagen2.yaml | 2 +- pom.xml | 2 +- scripts/bootstrap.sh | 3 +-- version.properties | 2 +- 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. org.onap.dcaegen2.deployments k8s-bootstrap-container dcaegen2-deployments-k8s-bootstrap-container - 2.0.2-SNAPSHOT + 2.0.3-SNAPSHOT http://maven.apache.org pom 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 -- cgit 1.2.3-korg