Fix Honeycomb installation in vDNS VM

Issue-ID: INT-853
Signed-off-by: Marco Platania <platania@research.att.com>
Change-Id: I8dd1cde406836de417fc7e1fabdf7b89d18b7fd2

diff --git a/heat/vLB/base_vlb.yaml b/heat/vLB/base_vlb.yaml
index 600bb10..87e397c 100644 (file)
--- a/heat/vLB/base_vlb.yaml
+++ b/heat/vLB/base_vlb.yaml
@@ -55,11 +55,11 @@ parameters:
     description: Private network that connects vLoadBalancer with vPacketGen
   onap_private_net_id:
     type: string
-    label: ECOMP management network name or ID
+    label: ONAP management network name or ID
     description: Private network that connects ONAP component and the VNF
   onap_private_subnet_id:
     type: string
-    label: ECOMP management sub-network name or ID
+    label: ONAP management sub-network name or ID
     description: Private sub-network that connects ONAP component and the VNF
   vlb_private_net_cidr:
     type: string

diff --git a/heat/vLBMS/base_vlb.yaml b/heat/vLBMS/base_vlb.yaml
index 980a3be..aad4ed4 100644 (file)
--- a/heat/vLBMS/base_vlb.yaml
+++ b/heat/vLBMS/base_vlb.yaml
@@ -71,11 +71,11 @@ parameters:
     description: Private network that connects vLoadBalancer with vPacketGen
   onap_private_net_id:
     type: string
-    label: ECOMP management network name or ID
+    label: ONAP management network name or ID
     description: Private network that connects ONAP component and the VNF
   onap_private_subnet_id:
     type: string
-    label: ECOMP management sub-network name or ID
+    label: ONAP management sub-network name or ID
     description: Private sub-network that connects ONAP component and the VNF
   vlb_private_net_cidr:
     type: string
@@ -421,6 +421,7 @@ resources:
             __oam_private_ipaddr__: { get_param: vdns_onap_private_ip_0 }
             __nb_api_version__: { get_param: nb_api_version }
             __install_script_version__: { get_param: install_script_version }
+            __demo_artifacts_version__: { get_param: demo_artifacts_version }
             __vlb_private_net_cidr__: { get_param: vlb_private_net_cidr }
             __onap_private_net_cidr__: { get_param: onap_private_net_cidr }
             __cloud_env__: { get_param: cloud_env }
@@ -437,6 +438,7 @@ resources:
             echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.txt
             echo "__nb_api_version__" > /opt/config/nb_api_version.txt
             echo "__install_script_version__" > /opt/config/install_script_version.txt
+            echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
             echo "__vlb_private_net_cidr__" > /opt/config/vlb_private_net_cidr.txt
             echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt

diff --git a/heat/vLBMS/dnsscaling.env b/heat/vLBMS/dnsscaling.env
index 2b93874..546ac91 100644 (file)
--- a/heat/vLBMS/dnsscaling.env
+++ b/heat/vLBMS/dnsscaling.env
@@ -34,6 +34,7 @@ parameters:
   # APP/USER_DATA
   nb_api_version: 1.2.0
   install_script_version: 1.5.0-SNAPSHOT
+  demo_artifacts_version: 1.5.0-SNAPSHOT
   cloud_env: PUT openstack OR rackspace HERE
   sec_group: PUT THE ONAP SECURITY GROUP HERE
   nexus_artifact_repo: https://nexus.onap.org

diff --git a/heat/vLBMS/dnsscaling.yaml b/heat/vLBMS/dnsscaling.yaml
index 60391d1..34fd9a3 100644 (file)
--- a/heat/vLBMS/dnsscaling.yaml
+++ b/heat/vLBMS/dnsscaling.yaml
@@ -116,7 +116,11 @@ parameters:
   install_script_version:
     type: string
     label: Installation script version number
-    description: Version number of the scripts that install the vFW demo app
+    description: Version number of the scripts that install the vLB/vDNS demo app
+  demo_artifacts_version:
+    type: string
+    label: Artifacts version used in demo vnfs
+    description: Artifacts (jar, tar.gz) version used in demo vnfs
   nb_api_version:
     type: string
     label: Northbound API version
@@ -200,6 +204,7 @@ resources:
             __oam_private_ipaddr__: { get_param: vdns_onap_private_ip_0 }
             __nb_api_version__: { get_param: nb_api_version }
             __install_script_version__: { get_param: install_script_version }
+            __demo_artifacts_version__: { get_param: demo_artifacts_version }
             __vlb_private_net_cidr__: { get_param: vlb_private_net_cidr }
             __onap_private_net_cidr__: { get_param: onap_private_net_cidr }
             __cloud_env__: { get_param: cloud_env }
@@ -216,6 +221,7 @@ resources:
             echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.txt
             echo "__nb_api_version__" > /opt/config/nb_api_version.txt
             echo "__install_script_version__" > /opt/config/install_script_version.txt
+            echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
             echo "__vlb_private_net_cidr__" > /opt/config/vlb_private_net_cidr.txt
             echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt

diff --git a/heat/vLB_CDS/vdns.env b/heat/vLB_CDS/vdns.env
index f5f17b9..8132e3e 100644 (file)
--- a/heat/vLB_CDS/vdns.env
+++ b/heat/vLB_CDS/vdns.env
@@ -33,6 +33,7 @@ parameters:
   # APP/USER_DATA
   nb_api_version: 1.2.0
   install_script_version: 1.5.0-SNAPSHOT
+  demo_artifacts_version: 1.5.0-SNAPSHOT
   cloud_env: PUT openstack OR rackspace HERE
   sec_group: PUT THE ONAP SECURITY GROUP HERE
   nexus_artifact_repo: https://nexus.onap.org
\ No newline at end of file

diff --git a/heat/vLB_CDS/vdns.yaml b/heat/vLB_CDS/vdns.yaml
index d3f6e7d..7a7ab30 100644 (file)
--- a/heat/vLB_CDS/vdns.yaml
+++ b/heat/vLB_CDS/vdns.yaml
@@ -112,7 +112,11 @@ parameters:
   install_script_version:
     type: string
     label: Installation script version number
-    description: Version number of the scripts that install the vFW demo app
+    description: Version number of the scripts that install the vLB/vDNS demo app
+  demo_artifacts_version:
+    type: string
+    label: Artifacts version used in demo vnfs
+    description: Artifacts (jar, tar.gz) version used in demo vnfs
   nb_api_version:
     type: string
     label: Northbound API version
@@ -183,6 +187,7 @@ resources:
             __oam_private_ipaddr__: { get_param: vdns_onap_private_ip_0 }
             __nb_api_version__: { get_param: nb_api_version }
             __install_script_version__: { get_param: install_script_version }
+            __demo_artifacts_version__: { get_param: demo_artifacts_version }
             __vlb_private_net_cidr__: { get_param: vlb_private_net_cidr }
             __onap_private_net_cidr__: { get_param: onap_private_net_cidr }
             __cloud_env__: { get_param: cloud_env }
@@ -199,6 +204,7 @@ resources:
             echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.txt
             echo "__nb_api_version__" > /opt/config/nb_api_version.txt
             echo "__install_script_version__" > /opt/config/install_script_version.txt
+            echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
             echo "__vlb_private_net_cidr__" > /opt/config/vlb_private_net_cidr.txt
             echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt

diff --git a/heat/vLB_HPA/base_vlb.yaml b/heat/vLB_HPA/base_vlb.yaml
index 1c7962c..e027626 100644 (file)
--- a/heat/vLB_HPA/base_vlb.yaml
+++ b/heat/vLB_HPA/base_vlb.yaml
@@ -63,11 +63,11 @@ parameters:
     description: Private network that connects vLoadBalancer with vPacketGen
   onap_private_net_id:
     type: string
-    label: ECOMP management network name or ID
+    label: ONAP management network name or ID
     description: Private network that connects ONAP component and the VNF
   onap_private_subnet_id:
     type: string
-    label: ECOMP management sub-network name or ID
+    label: ONAP management sub-network name or ID
     description: Private sub-network that connects ONAP component and the VNF
   vlb_private_net_cidr:
     type: string

diff --git a/heat/vLB_HPA/vLB_SRIOV_NIC/base_vlb.yaml b/heat/vLB_HPA/vLB_SRIOV_NIC/base_vlb.yaml
index 9c688a8..2b32907 100644 (file)
--- a/heat/vLB_HPA/vLB_SRIOV_NIC/base_vlb.yaml
+++ b/heat/vLB_HPA/vLB_SRIOV_NIC/base_vlb.yaml
@@ -71,11 +71,11 @@ parameters:
     description: provider network for private network that connects vLoadBalancer with vPacketGen
   onap_private_net_id:
     type: string
-    label: ECOMP management network name or ID
+    label: ONAP management network name or ID
     description: Private network that connects ONAP component and the VNF
   onap_private_subnet_id:
     type: string
-    label: ECOMP management sub-network name or ID
+    label: ONAP management sub-network name or ID
     description: Private sub-network that connects ONAP component and the VNF
   vlb_private_net_cidr:
     type: string