Update k8s blueprints to k8splugin 1.4.4

Also extend inventory timeout to 1800s

Issue-ID: DCAEGEN2-796
Change-Id: Idf687ac2035bedd357caf6245db4292d3a19cbd1
Signed-off-by: Jack Lucas <jflucas@research.att.com>

diff --git a/blueprints/k8s-config_binding_service.yaml-template b/blueprints/k8s-config_binding_service.yaml-template
index 1d52552..4e59818 100644 (file)
--- a/blueprints/k8s-config_binding_service.yaml-template
+++ b/blueprints/k8s-config_binding_service.yaml-template
@@ -24,7 +24,7 @@ description: >
 
 imports:
   - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
-  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.3/k8splugin_types.yaml
+  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.4/k8splugin_types.yaml
 
 inputs:
 

diff --git a/blueprints/k8s-datafile-collector.yaml-template b/blueprints/k8s-datafile-collector.yaml-template
index 93999c3..4ece77f 100644 (file)
--- 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
 \r
 imports:\r
 - "http://www.getcloudify.org/spec/cloudify/3.4/types.yaml"\r
-- {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.3/k8splugin_types.yaml\r
+- {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.4/k8splugin_types.yaml\r
 \r
 inputs:\r
   dmaap_mr_host:\r

diff --git a/blueprints/k8s-deployment_handler.yaml-template b/blueprints/k8s-deployment_handler.yaml-template
index b8b2865..d66f5d2 100644 (file)
--- a/blueprints/k8s-deployment_handler.yaml-template
+++ b/blueprints/k8s-deployment_handler.yaml-template
@@ -25,7 +25,7 @@ description: >
 
 imports:
   - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
-  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.3/k8splugin_types.yaml
+  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.4/k8splugin_types.yaml
 
 inputs:
 

diff --git a/blueprints/k8s-holmes-engine.yaml-template b/blueprints/k8s-holmes-engine.yaml-template
index ebf0df1..dbe9cc3 100644 (file)
--- 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.3/k8splugin_types.yaml"
+- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.4/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 e1ded8a..56ecc0c 100644 (file)
--- 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.3/k8splugin_types.yaml"
+- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.4/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 5f6d4a7..bb8d89c 100644 (file)
--- 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.3/k8splugin_types.yaml
+  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.4/k8splugin_types.yaml
 
 inputs:
   tag_version:

diff --git a/blueprints/k8s-inventory.yaml-template b/blueprints/k8s-inventory.yaml-template
index fd2d427..3272475 100644 (file)
--- a/blueprints/k8s-inventory.yaml-template
+++ b/blueprints/k8s-inventory.yaml-template
@@ -28,7 +28,7 @@ description: >
 
 imports:
   - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
-  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.3/k8splugin_types.yaml
+  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.4/k8splugin_types.yaml
 
 inputs:
 
@@ -156,7 +156,7 @@ node_templates:
       cloudify.interfaces.lifecycle:
         start:
           inputs:
-            max_wait: 900
+            max_wait: 1800
 
   postgres:
     type: dcae.nodes.ContainerizedApplication

diff --git a/blueprints/k8s-policy_handler.yaml-template b/blueprints/k8s-policy_handler.yaml-template
index aea1ae9..b6c5f9e 100644 (file)
--- a/blueprints/k8s-policy_handler.yaml-template
+++ b/blueprints/k8s-policy_handler.yaml-template
@@ -25,7 +25,7 @@ description: >
 
 imports:
   - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
-  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.3/k8splugin_types.yaml
+  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.4/k8splugin_types.yaml
 
 
 inputs:

diff --git a/blueprints/k8s-prh.yaml-template b/blueprints/k8s-prh.yaml-template
index 17bea87..eab58af 100644 (file)
--- 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.3/k8splugin_types.yaml
+  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.4/k8splugin_types.yaml
 
 inputs:
   aaiEnrichmentHost:

diff --git a/blueprints/k8s-snmptrap.yaml-template b/blueprints/k8s-snmptrap.yaml-template
index b679761..1bcecfb 100644 (file)
--- a/blueprints/k8s-snmptrap.yaml-template
+++ b/blueprints/k8s-snmptrap.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.3/k8splugin_types.yaml  
+  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.4/k8splugin_types.yaml  
 inputs:
   tag_version:
     type: string

diff --git a/blueprints/k8s-tca-policy.yaml-template b/blueprints/k8s-tca-policy.yaml-template
index 21c0e76..e5d7c0f 100644 (file)
--- 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.3/k8splugin_types.yaml
+  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.4/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 16ca4a3..27de1ae 100644 (file)
--- 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.3/k8splugin_types.yaml
+  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.4/k8splugin_types.yaml
 inputs:
   aaiEnrichmentHost:
     type: string

diff --git a/blueprints/k8s-ves.yaml-template b/blueprints/k8s-ves.yaml-template
index 4ae4a80..90bb20a 100644 (file)
--- 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.3/k8splugin_types.yaml
+  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.4/k8splugin_types.yaml
 
 inputs:
   ves_other_publish_url: