12 files changed, 152 insertions, 147 deletions
diff --git a/blueprints/k8s-dashboard.yaml-template b/blueprints/k8s-dashboard.yaml-template
index c9d6ce2..1d0fa10 100644
--- a/blueprints/k8s-dashboard.yaml-template
+++ b/blueprints/k8s-dashboard.yaml-template
@@ -1,4 +1,3 @@
-#
 # ============LICENSE_START====================================================
 # org.onap.dcae
 # =============================================================================
@@ -20,8 +19,9 @@
 tosca_definitions_version: cloudify_dsl_1_3
 
 imports:
-- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.12/k8splugin_types.yaml"
+- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.13/k8splugin_types.yaml"
 - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}/type_files/pgaas/1.1.0/pgaas_types.yaml"
+
 inputs:
  database_cluster_name:
     type: string
@@ -49,7 +49,7 @@ inputs:
     default: 'admin'
  consul_url:
     type: string
-    default: 'consul-server.onap.svc.cluster.local'
+    default: 'consul-server-ui'
  external_port:
     type: string
     description: Kubernetes node port for standard http
@@ -86,10 +86,12 @@ node_templates:
             postgres_port: { get_input: postgres_port }
             cloudify_user: { get_input: cloudify_user }
             cloudify_password: { get_input: cloudify_password }
-            consul_url: http://consul-server.onap.svc.cluster.local
-            #consul_url: concat: ["http://", { get_input: consul_url }]
-            cfy_url: http://dcae-cloudify-manager:8080
-            #cfy_url: concat: ["http://", { get_input: cloudify_ip },":8080"]
+            #consul_url: http://consul-server.onap.svc.cluster.local
+            consul_url:
+               concat: ["http://", { get_input: consul_url },":8500"]
+            #cfy_url: http://dcae-cloudify-manager:8080
+            cfy_url:
+               concat: ["http://", { get_input: cloudify_ip },"/api/v3.1"]
             inventory_url: http://inventory:8080
             dhandler_url: https://deployment-handler:8443
            ports:
@@ -102,6 +104,9 @@ node_templates:
         { get_input: dashboard_docker_image }
       replicas: {get_input: replicas}
       dns_name: 'dcae-dashboard'
+      tls_info:
+        cert_directory: '/usr/local/share/ca-certificates/'
+        use_tls: true
       docker_config:
         healthcheck:
           endpoint: /ccsdk-app/health
diff --git a/blueprints/k8s-holmes-engine.yaml-template b/blueprints/k8s-holmes-engine.yaml-template
index 0f5607f..db947e0 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.12/k8splugin_types.yaml"
+- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.13/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 d1235a5..e858587 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.12/k8splugin_types.yaml"
+- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.13/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 0519cd2..da4c688 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.12/k8splugin_types.yaml
+  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.13/k8splugin_types.yaml
 
 inputs:
   tag_version:
diff --git a/blueprints/k8s-prh.yaml-template b/blueprints/k8s-prh.yaml-template
index 9382de4..0f26976 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.12/k8splugin_types.yaml
+  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.13/k8splugin_types.yaml
 
 inputs:
   pnfUrl:
diff --git a/blueprints/k8s-snmptrap.yaml-template b/blueprints/k8s-snmptrap.yaml-template
index cae6954..d68bdd3 100644
--- 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.12/k8splugin_types.yaml
+  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.13/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 8c4031c..34f88a7 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.12/k8splugin_types.yaml
+  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.13/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 1964500..6ca738e 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.12/k8splugin_types.yaml
+  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.13/k8splugin_types.yaml
 inputs:
   aaiEnrichmentHost:
     type: string
diff --git a/blueprints/k8s-ves.yaml-template b/blueprints/k8s-ves.yaml-template
index 54a559b..3cf8d35 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.12/k8splugin_types.yaml
+  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.13/k8splugin_types.yaml
 
 inputs:
   ves_other_publish_url:
diff --git a/blueprints/k8s-datafile-collector.yaml-template b/blueprints/reference_templates/k8s-datafile-collector.yaml-template
index 1000b38..1ca8940 100644
--- a/blueprints/k8s-datafile-collector.yaml-template
+++ b/blueprints/reference_templates/k8s-datafile-collector.yaml-template
@@ -1,132 +1,132 @@
-# -*- indent-tabs-mode: nil -*- # vi: set expandtab:
-#
-# ============LICENSE_START====================================================
-# =============================================================================
-# Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
-# =============================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END======================================================
-
-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.12/k8splugin_types.yaml
-
-inputs:
-  dmaap_mr_host:
-    type: string
-    description: dmaap messagerouter host
-    default: message-router.onap.svc.cluster.local
-  dmaap_mr_port:
-    type: integer
-    description: dmaap messagerouter port
-    default: 3904
-  dmaap_mr_user:
-    type: string
-    description: dmaap messagerouter user name
-    default: "admin"
-  dmaap_mr_passwd:
-    type: string
-    description: dmaap messagerouter password
-    default: "admin"
-  dmaap_dr_host:
-    type: string
-    description: dmaap datarouter host
-    default: dmaap-dr-prov.onap.svc.cluster.local
-  dmaap_dr_port:
-    type: integer
-    description: dmaap datarouter port
-    default: 8443
-  dmaap_dr_user:
-    type: string
-    description: dmaap datarouter user name
-    default: "dradmin"
-  dmaap_dr_passwd:
-    type: string
-    description: dmaap datarouter password
-    default: "dradmin"
-  tag_version:
-    type: string
-    default: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.1.1"
-  replicas:
-    type: integer
-    description: number of instances
-    default: 1
-  host_port:
-    type: integer
-    description: port on Kubernetes host where datafile API will be exposed
-    default: 30223
-  host_port_secure:
-    type: integer
-    description: secure port on Kubernetes host where datafile API will be exposed
-    default: 30224
-  secureEnableCert:
-    type: boolean
-    description: enable certificate base connection with PNF and DMaap
-    default: false
-node_templates:
-  datafile-collector:
-    interfaces:
-      cloudify.interfaces.lifecycle:
-        start:
-          inputs:
-            ports:
-            - concat: ["8100:", { get_input: host_port }]
-            - concat: ["8433:", { get_input: host_port_secure}]
-    properties:
-      application_config:
-        dmaap.dmaapConsumerConfiguration.dmaapHostName: { get_input: dmaap_mr_host }
-        dmaap.dmaapConsumerConfiguration.dmaapPortNumber: { get_input: dmaap_mr_port }
-        dmaap.dmaapConsumerConfiguration.dmaapTopicName: "/events/unauthenticated.VES_NOTIFICATION_OUTPUT"
-        dmaap.dmaapConsumerConfiguration.dmaapProtocol: "http"
-        dmaap.dmaapConsumerConfiguration.dmaapUserName: { get_input: dmaap_mr_user }
-        dmaap.dmaapConsumerConfiguration.dmaapUserPassword: { get_input: dmaap_mr_passwd }
-        dmaap.dmaapConsumerConfiguration.dmaapContentType: "application/json"
-        dmaap.dmaapConsumerConfiguration.consumerId: "C12"
-        dmaap.dmaapConsumerConfiguration.consumerGroup: "OpenDCAE-c12"
-        dmaap.dmaapConsumerConfiguration.timeoutMs: -1
-        dmaap.dmaapConsumerConfiguration.messageLimit: -1
-        dmaap.dmaapProducerConfiguration.dmaapHostName: { get_input: dmaap_dr_host }
-        dmaap.dmaapProducerConfiguration.dmaapPortNumber: { get_input: dmaap_dr_port }
-        dmaap.dmaapProducerConfiguration.dmaapTopicName: "publish"
-        dmaap.dmaapProducerConfiguration.dmaapProtocol: "https"
-        dmaap.dmaapProducerConfiguration.dmaapUserName: { get_input: dmaap_dr_user }
-        dmaap.dmaapProducerConfiguration.dmaapUserPassword: { get_input: dmaap_dr_passwd }
-        dmaap.dmaapProducerConfiguration.dmaapContentType: "application/octet-stream"
-        dmaap.ftp.ftpesConfiguration.keyCert: "/opt/app/datafile/config/dfc.jks"
-        dmaap.ftp.ftpesConfiguration.keyPassword: "secret"
-        dmaap.ftp.ftpesConfiguration.trustedCa: "/opt/app/datafile/config/ftp.jks"
-        dmaap.ftp.ftpesConfiguration.trustedCaPassword: "secret"
-        dmaap.security.trustStorePath: "/opt/app/datafile/etc/cert/trust.jks"
-        dmaap.security.trustStorePasswordPath: "/opt/app/datafile/etc/cert/trust.pass"
-        dmaap.security.keyStorePath: "/opt/app/datafile/etc/cert/key.p12"
-        dmaap.security.keyStorePasswordPath: "/opt/app/datafile/etc/cert/key.pass"
-        dmaap.security.enableDmaapCertAuth: { get_input: secureEnableCert }
-      docker_config:
-        healthcheck:
-          endpoint: /heartbeat
-          interval: 15s
-          timeout: 1s
-          type: http
-      image:
-        get_input: tag_version
-      replicas: {get_input: replicas}
-      name: 'dcae-datafile-collector'
-      dns_name: 'dcae-datafile-collector'
-      log_info:
-        log_directory: "/opt/app/datafile/logs"
-      tls_info:
-        cert_directory: '/opt/app/datafile/etc/cert/'
-        use_tls: true
-    type: dcae.nodes.ContainerizedPlatformComponent
+# -*- indent-tabs-mode: nil -*- # vi: set expandtab:
+#
+# ============LICENSE_START====================================================
+# =============================================================================
+# Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
+# =============================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END======================================================
+
+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.13/k8splugin_types.yaml
+
+inputs:
+  dmaap_mr_host:
+    type: string
+    description: dmaap messagerouter host
+    default: message-router.onap.svc.cluster.local
+  dmaap_mr_port:
+    type: integer
+    description: dmaap messagerouter port
+    default: 3904
+  dmaap_mr_user:
+    type: string
+    description: dmaap messagerouter user name
+    default: "admin"
+  dmaap_mr_passwd:
+    type: string
+    description: dmaap messagerouter password
+    default: "admin"
+  dmaap_dr_host:
+    type: string
+    description: dmaap datarouter host
+    default: dmaap-dr-prov.onap.svc.cluster.local
+  dmaap_dr_port:
+    type: integer
+    description: dmaap datarouter port
+    default: 8443
+  dmaap_dr_user:
+    type: string
+    description: dmaap datarouter user name
+    default: "dradmin"
+  dmaap_dr_passwd:
+    type: string
+    description: dmaap datarouter password
+    default: "dradmin"
+  tag_version:
+    type: string
+    default: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:1.1.1"
+  replicas:
+    type: integer
+    description: number of instances
+    default: 1
+  host_port:
+    type: integer
+    description: port on Kubernetes host where datafile API will be exposed
+    default: 30223
+  host_port_secure:
+    type: integer
+    description: secure port on Kubernetes host where datafile API will be exposed
+    default: 30224
+  secureEnableCert:
+    type: boolean
+    description: enable certificate base connection with PNF and DMaap
+    default: false
+node_templates:
+  datafile-collector:
+    interfaces:
+      cloudify.interfaces.lifecycle:
+        start:
+          inputs:
+            ports:
+            - concat: ["8100:", { get_input: host_port }]
+            - concat: ["8433:", { get_input: host_port_secure}]
+    properties:
+      application_config:
+        dmaap.dmaapConsumerConfiguration.dmaapHostName: { get_input: dmaap_mr_host }
+        dmaap.dmaapConsumerConfiguration.dmaapPortNumber: { get_input: dmaap_mr_port }
+        dmaap.dmaapConsumerConfiguration.dmaapTopicName: "/events/unauthenticated.VES_NOTIFICATION_OUTPUT"
+        dmaap.dmaapConsumerConfiguration.dmaapProtocol: "http"
+        dmaap.dmaapConsumerConfiguration.dmaapUserName: { get_input: dmaap_mr_user }
+        dmaap.dmaapConsumerConfiguration.dmaapUserPassword: { get_input: dmaap_mr_passwd }
+        dmaap.dmaapConsumerConfiguration.dmaapContentType: "application/json"
+        dmaap.dmaapConsumerConfiguration.consumerId: "C12"
+        dmaap.dmaapConsumerConfiguration.consumerGroup: "OpenDCAE-c12"
+        dmaap.dmaapConsumerConfiguration.timeoutMs: -1
+        dmaap.dmaapConsumerConfiguration.messageLimit: -1
+        dmaap.dmaapProducerConfiguration.dmaapHostName: { get_input: dmaap_dr_host }
+        dmaap.dmaapProducerConfiguration.dmaapPortNumber: { get_input: dmaap_dr_port }
+        dmaap.dmaapProducerConfiguration.dmaapTopicName: "publish"
+        dmaap.dmaapProducerConfiguration.dmaapProtocol: "https"
+        dmaap.dmaapProducerConfiguration.dmaapUserName: { get_input: dmaap_dr_user }
+        dmaap.dmaapProducerConfiguration.dmaapUserPassword: { get_input: dmaap_dr_passwd }
+        dmaap.dmaapProducerConfiguration.dmaapContentType: "application/octet-stream"
+        dmaap.ftp.ftpesConfiguration.keyCert: "/opt/app/datafile/config/dfc.jks"
+        dmaap.ftp.ftpesConfiguration.keyPassword: "secret"
+        dmaap.ftp.ftpesConfiguration.trustedCa: "/opt/app/datafile/config/ftp.jks"
+        dmaap.ftp.ftpesConfiguration.trustedCaPassword: "secret"
+        dmaap.security.trustStorePath: "/opt/app/datafile/etc/cert/trust.jks"
+        dmaap.security.trustStorePasswordPath: "/opt/app/datafile/etc/cert/trust.pass"
+        dmaap.security.keyStorePath: "/opt/app/datafile/etc/cert/key.p12"
+        dmaap.security.keyStorePasswordPath: "/opt/app/datafile/etc/cert/key.pass"
+        dmaap.security.enableDmaapCertAuth: { get_input: secureEnableCert }
+      docker_config:
+        healthcheck:
+          endpoint: /heartbeat
+          interval: 15s
+          timeout: 1s
+          type: http
+      image:
+        get_input: tag_version
+      replicas: {get_input: replicas}
+      name: 'dcae-datafile-collector'
+      dns_name: 'dcae-datafile-collector'
+      log_info:
+        log_directory: "/opt/app/datafile/logs"
+      tls_info:
+        cert_directory: '/opt/app/datafile/etc/cert/'
+        use_tls: true
+    type: dcae.nodes.ContainerizedPlatformComponent
diff --git a/blueprints/k8s-pgaas-database.yaml-template b/blueprints/reference_templates/k8s-pgaas-database.yaml-template
index 309c962..309c962 100644
--- a/blueprints/k8s-pgaas-database.yaml-template
+++ b/blueprints/reference_templates/k8s-pgaas-database.yaml-template
diff --git a/blueprints/k8s-pgaas-getdbinfo.yaml-template b/blueprints/reference_templates/k8s-pgaas-getdbinfo.yaml-template
index 6869f2c..6869f2c 100644
--- a/blueprints/k8s-pgaas-getdbinfo.yaml-template
+++ b/blueprints/reference_templates/k8s-pgaas-getdbinfo.yaml-template