summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoeOLeary <joseph.o.leary@est.tech>2019-10-10 19:20:07 +0100
committerJoeOLeary <joseph.o.leary@est.tech>2019-10-10 20:01:21 +0100
commitab68adec34145eecc3763f39095c04dc405f8845 (patch)
tree03ba65863712c9b3641b1f4b3657eb40a930d807
parent820aa3973153fafea8eaaa9ef0fd23fc83babf00 (diff)
Fix feed creation conflict5.0.2-ONAPelalto
Signed-off-by: JoeOLeary <joseph.o.leary@est.tech> Change-Id: I3498389fdd02e598924c2652e895bdeeffc12622 Issue-ID: DCAEGEN2-1793
-rw-r--r--datafile-app-server/dpo/blueprints/k8s-datafile.yaml7
1 files changed, 4 insertions, 3 deletions
diff --git a/datafile-app-server/dpo/blueprints/k8s-datafile.yaml b/datafile-app-server/dpo/blueprints/k8s-datafile.yaml
index 2de0a248..2d5f5912 100644
--- a/datafile-app-server/dpo/blueprints/k8s-datafile.yaml
+++ b/datafile-app-server/dpo/blueprints/k8s-datafile.yaml
@@ -20,8 +20,8 @@
tosca_definitions_version: cloudify_dsl_1_3
imports:
- - "http://www.getcloudify.org/spec/cloudify/3.4/types.yaml"
- - "https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.13/k8splugin_types.yaml"
+ - "http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml"
+ - "https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R5/k8splugin/1.6.0/k8splugin_types.yaml"
- "https://nexus.onap.org/service/local/repositories/raw/content/org.onap.ccsdk.platform.plugins/type_files/dmaap/dmaap.yaml"
inputs:
@@ -40,7 +40,7 @@ inputs:
tag_version:
type: string
description: DFC image tag/version
- default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.2.0"
+ default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.2.3"
replicas:
type: integer
description: number of instances
@@ -63,6 +63,7 @@ node_templates:
properties:
feed_name: { get_input: feedName }
feed_description: { get_input: feedDescription }
+ useExisting: true
datafile-collector:
type: dcae.nodes.ContainerizedServiceComponentUsingDmaap