aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lucas <jflucas@research.att.com>2019-04-10 09:06:34 -0400
committerJack Lucas <jflucas@research.att.com>2019-04-10 09:09:58 -0400
commit01b986942b24af425c9bcf17bb61bfad1dca01aa (patch)
tree1305e837f0b7af9f7dddaf1be5423ce1ed894bad
parent5f69f150a176c8f261a66d84a17cf6f4f9cf5d00 (diff)
Update k8s plugin version
Change-Id: I4d5957a9621b5f8e9bdc8259878e8f8cf220e340 Issue-ID: DCAEGEN2-1136 Signed-off-by: Jack Lucas <jflucas@research.att.com>
-rw-r--r--blueprints/k8s-dashboard.yaml-template14
-rw-r--r--blueprints/k8s-datafile-collector.yaml-template2
-rw-r--r--blueprints/k8s-holmes-engine.yaml-template2
-rw-r--r--blueprints/k8s-holmes-rules.yaml-template2
-rw-r--r--blueprints/k8s-hv-ves.yaml-template2
-rw-r--r--blueprints/k8s-prh.yaml-template2
-rw-r--r--blueprints/k8s-snmptrap.yaml-template8
-rw-r--r--blueprints/k8s-tca-policy.yaml-template2
-rw-r--r--blueprints/k8s-tca.yaml-template2
-rw-r--r--blueprints/k8s-ves.yaml-template8
10 files changed, 22 insertions, 22 deletions
diff --git a/blueprints/k8s-dashboard.yaml-template b/blueprints/k8s-dashboard.yaml-template
index 80a6bcc..c9d6ce2 100644
--- a/blueprints/k8s-dashboard.yaml-template
+++ b/blueprints/k8s-dashboard.yaml-template
@@ -20,7 +20,7 @@
tosca_definitions_version: cloudify_dsl_1_3
imports:
-- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.5/k8splugin_types.yaml"
+- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.12/k8splugin_types.yaml"
- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}/type_files/pgaas/1.1.0/pgaas_types.yaml"
inputs:
database_cluster_name:
@@ -49,15 +49,15 @@ inputs:
default: 'admin'
consul_url:
type: string
- default: 'consul-server.onap.svc.cluster.local'
+ default: 'consul-server.onap.svc.cluster.local'
external_port:
type: string
description: Kubernetes node port for standard http
- default: "30418"
+ default: "30418"
external_tls_port:
type: string
description: Kubernetes node port for standard https
- default: "30419"
+ default: "30419"
replicas:
type: integer
description: number of instances
@@ -93,8 +93,8 @@ node_templates:
inventory_url: http://inventory:8080
dhandler_url: https://deployment-handler:8443
ports:
- - concat: ["8080:", { get_input: external_port }]
- - concat: ["8443:", { get_input: external_tls_port }]
+ - concat: ["8080:", { get_input: external_port }]
+ - concat: ["8443:", { get_input: external_tls_port }]
properties:
name:
"dcae-dashboard"
@@ -107,7 +107,7 @@ node_templates:
endpoint: /ccsdk-app/health
interval: 15s
timeout: 1s
- type: http
+ type: http
relationships:
- type: cloudify.relationships.depends_on
target: pgaasdb
diff --git a/blueprints/k8s-datafile-collector.yaml-template b/blueprints/k8s-datafile-collector.yaml-template
index 3a3f432..dc9013f 100644
--- a/blueprints/k8s-datafile-collector.yaml-template
+++ b/blueprints/k8s-datafile-collector.yaml-template
@@ -21,7 +21,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- "http://www.getcloudify.org/spec/cloudify/3.4/types.yaml"
-- {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.5/k8splugin_types.yaml
+- {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.12/k8splugin_types.yaml
inputs:
dmaap_mr_host:
diff --git a/blueprints/k8s-holmes-engine.yaml-template b/blueprints/k8s-holmes-engine.yaml-template
index f1129e1..0f5607f 100644
--- a/blueprints/k8s-holmes-engine.yaml-template
+++ b/blueprints/k8s-holmes-engine.yaml-template
@@ -19,7 +19,7 @@
tosca_definitions_version: cloudify_dsl_1_3
imports:
-- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.5/k8splugin_types.yaml"
+- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.12/k8splugin_types.yaml"
- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml"
- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}/type_files/pgaas/1.1.0/pgaas_types.yaml"
inputs:
diff --git a/blueprints/k8s-holmes-rules.yaml-template b/blueprints/k8s-holmes-rules.yaml-template
index 5a634fe..d1235a5 100644
--- a/blueprints/k8s-holmes-rules.yaml-template
+++ b/blueprints/k8s-holmes-rules.yaml-template
@@ -19,7 +19,7 @@
tosca_definitions_version: cloudify_dsl_1_3
imports:
-- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.5/k8splugin_types.yaml"
+- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.12/k8splugin_types.yaml"
- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml"
- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}/type_files/pgaas/1.1.0/pgaas_types.yaml"
inputs:
diff --git a/blueprints/k8s-hv-ves.yaml-template b/blueprints/k8s-hv-ves.yaml-template
index 8572c39..85d071e 100644
--- a/blueprints/k8s-hv-ves.yaml-template
+++ b/blueprints/k8s-hv-ves.yaml-template
@@ -21,7 +21,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- 'http://www.getcloudify.org/spec/cloudify/3.4/types.yaml'
- - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.5/k8splugin_types.yaml
+ - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.12/k8splugin_types.yaml
inputs:
tag_version:
diff --git a/blueprints/k8s-prh.yaml-template b/blueprints/k8s-prh.yaml-template
index d24144b..0032c87 100644
--- a/blueprints/k8s-prh.yaml-template
+++ b/blueprints/k8s-prh.yaml-template
@@ -21,7 +21,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- "http://www.getcloudify.org/spec/cloudify/3.4/types.yaml"
- - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.5/k8splugin_types.yaml
+ - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.12/k8splugin_types.yaml
inputs:
pnfUrl:
diff --git a/blueprints/k8s-snmptrap.yaml-template b/blueprints/k8s-snmptrap.yaml-template
index 6111e32..cae6954 100644
--- a/blueprints/k8s-snmptrap.yaml-template
+++ b/blueprints/k8s-snmptrap.yaml-template
@@ -21,11 +21,11 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- "http://www.getcloudify.org/spec/cloudify/3.4/types.yaml"
- - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.5/k8splugin_types.yaml
+ - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.12/k8splugin_types.yaml
inputs:
tag_version:
type: string
- default: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.collectors.snmptrap:1.4.0"
+ default: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.collectors.snmptrap:1.4.0"
cache:
type: string
default:
@@ -76,7 +76,7 @@ inputs:
external_port:
type: string
description: Kubernetes node port on which collector is exposed
- default: "30470"
+ default: "30470"
replicas:
type: integer
description: number of instances
@@ -89,7 +89,7 @@ node_templates:
start:
inputs:
ports:
- - concat: ["6162/udp:", { get_input: external_port }]
+ - concat: ["6162/udp:", { get_input: external_port }]
properties:
application_config:
StormWatchPolicy: ''
diff --git a/blueprints/k8s-tca-policy.yaml-template b/blueprints/k8s-tca-policy.yaml-template
index 858679a..8c4031c 100644
--- a/blueprints/k8s-tca-policy.yaml-template
+++ b/blueprints/k8s-tca-policy.yaml-template
@@ -23,7 +23,7 @@ description: >
imports:
- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
- - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.5/k8splugin_types.yaml
+ - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.12/k8splugin_types.yaml
- {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml
inputs:
aaiEnrichmentHost:
diff --git a/blueprints/k8s-tca.yaml-template b/blueprints/k8s-tca.yaml-template
index 74a4e4b..1964500 100644
--- a/blueprints/k8s-tca.yaml-template
+++ b/blueprints/k8s-tca.yaml-template
@@ -23,7 +23,7 @@ description: >
imports:
- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
- - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.5/k8splugin_types.yaml
+ - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.12/k8splugin_types.yaml
inputs:
aaiEnrichmentHost:
type: string
diff --git a/blueprints/k8s-ves.yaml-template b/blueprints/k8s-ves.yaml-template
index 29071f4..54a559b 100644
--- a/blueprints/k8s-ves.yaml-template
+++ b/blueprints/k8s-ves.yaml-template
@@ -21,7 +21,7 @@ tosca_definitions_version: cloudify_dsl_1_3
imports:
- "http://www.getcloudify.org/spec/cloudify/3.4/types.yaml"
- - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.5/k8splugin_types.yaml
+ - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.12/k8splugin_types.yaml
inputs:
ves_other_publish_url:
@@ -56,7 +56,7 @@ inputs:
replicas:
type: integer
description: number of instances
- default: 1
+ default: 1
node_templates:
ves:
interfaces:
@@ -64,7 +64,7 @@ node_templates:
start:
inputs:
ports:
- - concat: ["8080:", { get_input: external_port }]
+ - concat: ["8080:", { get_input: external_port }]
- concat: ["8443:", { get_input: external_tls_port }]
properties:
application_config:
@@ -127,5 +127,5 @@ node_templates:
log_info:
log_directory: "/opt/app/VESCollector/logs/ecomp"
type: dcae.nodes.ContainerizedPlatformComponent
-
+