summaryrefslogtreecommitdiffstats
path: root/heat/vLB
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2017-08-17 12:38:47 -0400
committerMarco Platania <platania@research.att.com>2017-08-17 12:38:47 -0400
commitbdc999846e5888a4e4c87b2fbdf06123f32b0c0f (patch)
tree42a922667a0a339cc99f1bf9b518b6b44ae249a4 /heat/vLB
parent8d74252fc15feb54fcacb6b0456fb29acdbd3faa (diff)
Refactor Heat templates for vLB
- Eliminate Rackspace vs OpenStack distintion - Rename templates without cloud provider name Change-Id: I849e8239afde122f1b1e180108dc51122a267165 Issue-ID: UCA-34 Signed-off-by: Marco Platania <platania@research.att.com>
Diffstat (limited to 'heat/vLB')
-rw-r--r--heat/vLB/base_vlb.env (renamed from heat/vLB/base_vlb_openstack.env)2
-rw-r--r--heat/vLB/base_vlb.yaml (renamed from heat/vLB/base_vlb_openstack.yaml)0
-rw-r--r--heat/vLB/base_vlb_rackspace.env26
-rw-r--r--heat/vLB/base_vlb_rackspace.yaml287
-rw-r--r--heat/vLB/dnsscaling.env (renamed from heat/vLB/dnsscaling_openstack.env)2
-rw-r--r--heat/vLB/dnsscaling.yaml (renamed from heat/vLB/dnsscaling_openstack.yaml)0
-rw-r--r--heat/vLB/dnsscaling_rackspace.env21
-rw-r--r--heat/vLB/dnsscaling_rackspace.yaml197
-rw-r--r--heat/vLB/packet_gen_vlb.env13
-rw-r--r--heat/vLB/packet_gen_vlb.yaml146
10 files changed, 2 insertions, 692 deletions
diff --git a/heat/vLB/base_vlb_openstack.env b/heat/vLB/base_vlb.env
index ab95f362..50da384f 100644
--- a/heat/vLB/base_vlb_openstack.env
+++ b/heat/vLB/base_vlb.env
@@ -32,4 +32,4 @@ parameters:
install_script_version: 1.1.0-SNAPSHOT
key_name: vlb_key
pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
- cloud_env: openstack
+ cloud_env: PUT openstack OR backspace HERE
diff --git a/heat/vLB/base_vlb_openstack.yaml b/heat/vLB/base_vlb.yaml
index fa4fea0a..fa4fea0a 100644
--- a/heat/vLB/base_vlb_openstack.yaml
+++ b/heat/vLB/base_vlb.yaml
diff --git a/heat/vLB/base_vlb_rackspace.env b/heat/vLB/base_vlb_rackspace.env
deleted file mode 100644
index e4c31843..00000000
--- a/heat/vLB/base_vlb_rackspace.env
+++ /dev/null
@@ -1,26 +0,0 @@
-parameters:
- vlb_image_name: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
- vlb_flavor_name: 4 GB General Purpose v1
- public_net_id: 00000000-0000-0000-0000-000000000000
- vlb_private_net_id: zdfw1lb01_private
- onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
- onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
- vlb_private_net_cidr: 192.168.10.0/24
- onap_private_net_cidr: 10.0.0.0/16
- vlb_private_ip_0: 192.168.10.111
- vlb_private_ip_1: 10.0.100.4
- vdns_private_ip_0: 192.168.10.211
- vdns_private_ip_1: 10.0.100.5
- vlb_name_0: zdfw1lb01lb01
- vdns_name_0: zdfw1lb01dns01
- vnf_id: vLoadBalancer_demo_app
- vf_module_id: vLoadBalancer
- dcae_collector_ip: 10.0.4.102
- dcae_collector_port: 8080
- repo_url_blob: https://nexus.onap.org/content/sites/raw
- repo_url_artifacts: https://nexus.onap.org/content/groups/staging
- demo_artifacts_version: 1.1.0
- install_script_version: 1.1.0-SNAPSHOT
- key_name: vlb_key
- pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
- cloud_env: rackspace
diff --git a/heat/vLB/base_vlb_rackspace.yaml b/heat/vLB/base_vlb_rackspace.yaml
deleted file mode 100644
index 316f4cfb..00000000
--- a/heat/vLB/base_vlb_rackspace.yaml
+++ /dev/null
@@ -1,287 +0,0 @@
-##########################################################################
-#
-#==================LICENSE_START==========================================
-#
-#
-# Copyright © 2017 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============================================
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-#
-##########################################################################
-
-heat_template_version: 2013-05-23
-
-description: Heat template to deploy vLoadBalancer/vDNS demo app for ONAP
-
-##############
-# #
-# PARAMETERS #
-# #
-##############
-
-parameters:
- vlb_image_name:
- type: string
- label: Image name or ID
- description: Image to be used for compute instance
- vlb_flavor_name:
- type: string
- label: Flavor
- description: Type of instance (flavor) to be used
- public_net_id:
- type: string
- label: Public network name or ID
- description: Public network that enables remote connection to VNF
- vlb_private_net_id:
- type: string
- label: vLoadBalancer private network name or ID
- description: Private network that connects vLoadBalancer with vDNSs
- onap_private_net_id:
- type: string
- label: ONAP management network name or ID
- description: Private network that connects ONAP components and the VNF
- onap_private_subnet_id:
- type: string
- label: ONAP management sub-network name or ID
- description: Private sub-network that connects ONAP components and the VNF
- vlb_private_net_cidr:
- type: string
- label: vLoadBalancer private network CIDR
- description: The CIDR of the vLoadBalancer private network
- onap_private_net_cidr:
- type: string
- label: ONAP private network CIDR
- description: The CIDR of the protected private network
- vlb_private_ip_0:
- type: string
- label: vLoadBalancer private IP address towards the private network
- description: Private IP address that is assigned to the vLoadBalancer to communicate with the vDNSs
- vlb_private_ip_1:
- type: string
- label: vLoadBalancer private IP address towards the ONAP management network
- description: Private IP address that is assigned to the vLoadBalancer to communicate with ONAP components
- vdns_private_ip_0:
- type: string
- label: vDNS private IP address towards the private network
- description: Private IP address that is assigned to the vDNS to communicate with the vLoadBalancer
- vdns_private_ip_1:
- type: string
- label: vDNS private IP address towards the ONAP management network
- description: Private IP address that is assigned to the vDNS to communicate with ONAP components
- vlb_name_0:
- type: string
- label: vLoadBalancer name
- description: Name of the vLoadBalancer
- vdns_name_0:
- type: string
- label: vDNS name
- description: Name of the vDNS
- vnf_id:
- type: string
- label: VNF ID
- description: The VNF ID is provided by ONAP
- vf_module_id:
- type: string
- label: vFirewall module ID
- description: The vLoadBalancer Module ID is provided by ONAP
- dcae_collector_ip:
- type: string
- label: DCAE collector IP address
- description: IP address of the DCAE collector
- dcae_collector_port:
- type: string
- label: DCAE collector port
- description: Port of the DCAE collector
- key_name:
- type: string
- label: Key pair name
- description: Public/Private key pair name
- pub_key:
- type: string
- label: Public key
- description: Public key to be installed on the compute instance
- repo_url_blob:
- type: string
- label: Repository URL
- description: URL of the repository that hosts the demo packages
- repo_url_artifacts:
- type: string
- label: Repository URL
- description: URL of the repository that hosts the demo packages
- install_script_version:
- type: string
- label: Installation script version number
- description: Version number of the scripts that install the vFW demo app
- demo_artifacts_version:
- type: string
- label: Artifacts version used in demo vnfs
- description: Artifacts (jar, tar.gz) version used in demo vnfs
- cloud_env:
- type: string
- label: Cloud environment
- description: Cloud environment (e.g., openstack, rackspace)
-
-#############
-# #
-# RESOURCES #
-# #
-#############
-
-resources:
-
- random-str:
- type: OS::Heat::RandomString
- properties:
- length: 4
-
- my_keypair:
- type: OS::Nova::KeyPair
- properties:
- name:
- str_replace:
- template: base_rand
- params:
- base: { get_param: key_name }
- rand: { get_resource: random-str }
- public_key: { get_param: pub_key }
- save_private_key: false
-
- vlb_private_network:
- type: OS::Neutron::Net
- properties:
- name: { get_param: vlb_private_net_id }
-
- vlb_private_subnet:
- type: OS::Neutron::Subnet
- properties:
- name: { get_param: vlb_private_net_id }
- network_id: { get_resource: vlb_private_network }
- cidr: { get_param: vlb_private_net_cidr }
-
- # Virtual Load Balancer Instantiation
- vlb_private_0_port:
- type: OS::Neutron::Port
- properties:
- network: { get_resource: vlb_private_network }
- fixed_ips: [{"subnet": { get_resource: vlb_private_subnet }, "ip_address": { get_param: vlb_private_ip_0 }}]
-
- vlb_private_1_port:
- type: OS::Neutron::Port
- properties:
- network: { get_param: onap_private_net_id }
- fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vlb_private_ip_1 }}]
-
- vlb_0:
- type: OS::Nova::Server
- properties:
- image: { get_param: vlb_image_name }
- flavor: { get_param: vlb_flavor_name }
- name: { get_param: vlb_name_0 }
- key_name: { get_resource: my_keypair }
- networks:
- - network: { get_param: public_net_id }
- - port: { get_resource: vlb_private_0_port }
- - port: { get_resource: vlb_private_1_port }
- metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
- user_data_format: RAW
- user_data:
- str_replace:
- params:
- __dcae_collector_ip__: { get_param: dcae_collector_ip }
- __dcae_collector_port__: { get_param: dcae_collector_port }
- __local_private_ipaddr__: { get_param: vlb_private_ip_0 }
- __repo_url_blob__ : { get_param: repo_url_blob }
- __repo_url_artifacts__ : { get_param: repo_url_artifacts }
- __demo_artifacts_version__ : { get_param: demo_artifacts_version }
- __install_script_version__ : { get_param: install_script_version }
- __cloud_env__ : { get_param: cloud_env }
- template: |
- #!/bin/bash
-
- # Create configuration files
- mkdir /opt/config
- echo "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt
- echo "__dcae_collector_port__" > /opt/config/dcae_collector_port.txt
- echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt
- echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
- echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
- echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
- echo "__install_script_version__" > /opt/config/install_script_version.txt
- echo "__cloud_env__" > /opt/config/cloud_env.txt
-
- # Download and run install script
- curl -k __repo_url_blob__/org.onap.demo/vnfs/vlb/__install_script_version__/v_lb_install.sh -o /opt/v_lb_install.sh
- cd /opt
- chmod +x v_lb_install.sh
- ./v_lb_install.sh
-
-
- # Virtual DNS Instantiation
- vdns_private_0_port:
- type: OS::Neutron::Port
- properties:
- network: { get_resource: vlb_private_network }
- fixed_ips: [{"subnet": { get_resource: vlb_private_subnet }, "ip_address": { get_param: vdns_private_ip_0 }}]
-
- vdns_private_1_port:
- type: OS::Neutron::Port
- properties:
- network: { get_param: onap_private_net_id }
- fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vdns_private_ip_1 }}]
-
- vdns_0:
- type: OS::Nova::Server
- properties:
- image: { get_param: vlb_image_name }
- flavor: { get_param: vlb_flavor_name }
- name: { get_param: vdns_name_0 }
- key_name: { get_resource: my_keypair }
- networks:
- - network: { get_param: public_net_id }
- - port: { get_resource: vdns_private_0_port }
- - port: { get_resource: vdns_private_1_port }
- metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
- user_data_format: RAW
- user_data:
- str_replace:
- params:
- __lb_oam_int__ : { get_param: vlb_private_ip_1 }
- __lb_private_ipaddr__: { get_param: vlb_private_ip_0 }
- __local_private_ipaddr__: { get_param: vdns_private_ip_0 }
- __repo_url_blob__ : { get_param: repo_url_blob }
- __repo_url_artifacts__ : { get_param: repo_url_artifacts }
- __demo_artifacts_version__ : { get_param: demo_artifacts_version }
- __install_script_version__ : { get_param: install_script_version }
- __cloud_env__ : { get_param: cloud_env }
- template: |
- #!/bin/bash
-
- # Create configuration files
- mkdir /opt/config
- echo "__lb_oam_int__" > /opt/config/lb_oam_int.txt
- echo "__lb_private_ipaddr__" > /opt/config/lb_private_ipaddr.txt
- echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt
- echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
- echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
- echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
- echo "__install_script_version__" > /opt/config/install_script_version.txt
- echo "__cloud_env__" > /opt/config/cloud_env.txt
-
- # Download and run install script
- curl -k __repo_url_blob__/org.onap.demo/vnfs/vlb/__install_script_version__/v_dns_install.sh -o /opt/v_dns_install.sh
- cd /opt
- chmod +x v_dns_install.sh
- ./v_dns_install.sh \ No newline at end of file
diff --git a/heat/vLB/dnsscaling_openstack.env b/heat/vLB/dnsscaling.env
index 3cc328f4..5a7839b8 100644
--- a/heat/vLB/dnsscaling_openstack.env
+++ b/heat/vLB/dnsscaling.env
@@ -20,4 +20,4 @@ parameters:
install_script_version: 1.1.0-SNAPSHOT
key_name: vlb_key_scaling
pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
- cloud_env: openstack
+ cloud_env: PUT openstack OR backspace HERE \ No newline at end of file
diff --git a/heat/vLB/dnsscaling_openstack.yaml b/heat/vLB/dnsscaling.yaml
index 20718276..20718276 100644
--- a/heat/vLB/dnsscaling_openstack.yaml
+++ b/heat/vLB/dnsscaling.yaml
diff --git a/heat/vLB/dnsscaling_rackspace.env b/heat/vLB/dnsscaling_rackspace.env
deleted file mode 100644
index 619b35c7..00000000
--- a/heat/vLB/dnsscaling_rackspace.env
+++ /dev/null
@@ -1,21 +0,0 @@
-parameters:
- vlb_image_name: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
- vlb_flavor_name: 4 GB General Purpose v1
- public_net_id: 00000000-0000-0000-0000-000000000000
- vlb_private_net_id: zdfw1lb01_private
- onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
- onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
- vlb_private_ip_0: 192.168.10.111
- vlb_private_ip_1: 10.0.100.4
- vdns_private_ip_0: 192.168.10.212
- vdns_private_ip_1: 10.0.100.6
- vdns_name_0: zdfw1lb01dns02
- vnf_id: vLoadBalancer_demo_app
- vf_module_id: vLoadBalancer
- repo_url_blob: https://nexus.onap.org/content/sites/raw
- repo_url_artifacts: https://nexus.onap.org/content/groups/staging
- demo_artifacts_version: 1.1.0
- install_script_version: 1.1.0-SNAPSHOT
- key_name: vlb_key_scaling
- pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
- cloud_env: rackspace
diff --git a/heat/vLB/dnsscaling_rackspace.yaml b/heat/vLB/dnsscaling_rackspace.yaml
deleted file mode 100644
index 7a53a561..00000000
--- a/heat/vLB/dnsscaling_rackspace.yaml
+++ /dev/null
@@ -1,197 +0,0 @@
-##########################################################################
-#
-#==================LICENSE_START==========================================
-#
-#
-# Copyright © 2017 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============================================
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-#
-##########################################################################
-
-heat_template_version: 2013-05-23
-
-description: Heat template to deploy a vDNS for ONAP (scaling-up scenario)
-
-##############
-# #
-# PARAMETERS #
-# #
-##############
-
-parameters:
- vlb_image_name:
- type: string
- label: Image name or ID
- description: Image to be used for compute instance
- vlb_flavor_name:
- type: string
- label: Flavor
- description: Type of instance (flavor) to be used
- public_net_id:
- type: string
- label: Public network name or ID
- description: Public network that enables remote connection to VNF
- vlb_private_net_id:
- type: string
- label: vLoadBalancer private network name or ID
- description: Private network that connects vLoadBalancer with vDNSs
- onap_private_net_id:
- type: string
- label: ONAP management network name or ID
- description: Private network that connects ONAP components and the VNF
- onap_private_subnet_id:
- type: string
- label: ONAP management sub-network name or ID
- description: Private sub-network that connects ONAP components and the VNF
- vlb_private_ip_0:
- type: string
- label: vLoadBalancer private IP address towards the private network
- description: Private IP address that is assigned to the vLoadBalancer to communicate with the vDNSs
- vlb_private_ip_1:
- type: string
- label: vLoadBalancer private IP address towards the ONAP management network
- description: Private IP address that is assigned to the vLoadBalancer to communicate with ONAP components
- vdns_private_ip_0:
- type: string
- label: vDNS private IP address towards the private network
- description: Private IP address that is assigned to the vDNS to communicate with the vLoadBalancer
- vdns_private_ip_1:
- type: string
- label: vDNS private IP address towards the ONAP management network
- description: Private IP address that is assigned to the vDNS to communicate with ONAP components
- vdns_name_0:
- type: string
- label: vDNS name
- description: Name of the vDNS
- vnf_id:
- type: string
- label: VNF ID
- description: The VNF ID is provided by ONAP
- vf_module_id:
- type: string
- label: vFirewall module ID
- description: The vLoadBalancer Module ID is provided by ONAP
- key_name:
- type: string
- label: Key pair name
- description: Public/Private key pair name
- pub_key:
- type: string
- label: Public key
- description: Public key to be installed on the compute instance
- repo_url_blob:
- type: string
- label: Repository URL
- description: URL of the repository that hosts the demo packages
- repo_url_artifacts:
- type: string
- label: Repository URL
- description: URL of the repository that hosts the demo packages
- install_script_version:
- type: string
- label: Installation script version number
- description: Version number of the scripts that install the vFW demo app
- demo_artifacts_version:
- type: string
- label: Artifacts version used in demo vnfs
- description: Artifacts (jar, tar.gz) version used in demo vnfs
- cloud_env:
- type: string
- label: Cloud environment
- description: Cloud environment (e.g., openstack, rackspace)
-
-#############
-# #
-# RESOURCES #
-# #
-#############
-
-resources:
-
- random-str:
- type: OS::Heat::RandomString
- properties:
- length: 4
-
- my_keypair:
- type: OS::Nova::KeyPair
- properties:
- name:
- str_replace:
- template: base_rand
- params:
- base: { get_param: key_name }
- rand: { get_resource: random-str }
- public_key: { get_param: pub_key }
- save_private_key: false
-
- # Virtual DNS Instantiation
- vdns_private_0_port:
- type: OS::Neutron::Port
- properties:
- network: { get_param: vlb_private_net_id }
- fixed_ips: [{"subnet": { get_param: vlb_private_net_id }, "ip_address": { get_param: vdns_private_ip_0 }}]
-
- vdns_private_1_port:
- type: OS::Neutron::Port
- properties:
- network: { get_param: onap_private_net_id }
- fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vdns_private_ip_1 }}]
-
- vdns_0:
- type: OS::Nova::Server
- properties:
- image: { get_param: vlb_image_name }
- flavor: { get_param: vlb_flavor_name }
- name: { get_param: vdns_name_0 }
- key_name: { get_resource: my_keypair }
- networks:
- - network: { get_param: public_net_id }
- - port: { get_resource: vdns_private_0_port }
- - port: { get_resource: vdns_private_1_port }
- metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }}
- user_data_format: RAW
- user_data:
- str_replace:
- params:
- __lb_oam_int__ : { get_param: vlb_private_ip_1 }
- __lb_private_ipaddr__: { get_param: vlb_private_ip_0 }
- __local_private_ipaddr__: { get_param: vdns_private_ip_0 }
- __repo_url_blob__ : { get_param: repo_url_blob }
- __repo_url_artifacts__ : { get_param: repo_url_artifacts }
- __demo_artifacts_version__ : { get_param: demo_artifacts_version }
- __install_script_version__ : { get_param: install_script_version }
- __cloud_env__ : { get_param: cloud_env }
- template: |
- #!/bin/bash
-
- # Create configuration files
- mkdir /opt/config
- echo "__lb_oam_int__" > /opt/config/lb_oam_int.txt
- echo "__lb_private_ipaddr__" > /opt/config/lb_private_ipaddr.txt
- echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt
- echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
- echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
- echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
- echo "__install_script_version__" > /opt/config/install_script_version.txt
- echo "__cloud_env__" > /opt/config/cloud_env.txt
-
- # Download and run install script
- curl -k __repo_url_blob__/org.onap.demo/vnfs/vlb/__install_script_version__/v_dns_install.sh -o /opt/v_dns_install.sh
- cd /opt
- chmod +x v_dns_install.sh
- ./v_dns_install.sh \ No newline at end of file
diff --git a/heat/vLB/packet_gen_vlb.env b/heat/vLB/packet_gen_vlb.env
deleted file mode 100644
index 362b8a99..00000000
--- a/heat/vLB/packet_gen_vlb.env
+++ /dev/null
@@ -1,13 +0,0 @@
-parameters:
- vpg_image_name: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
- vpg_flavor_name: 4 GB General Purpose v1
- public_net_id: 00000000-0000-0000-0000-000000000000
- vlb_ipaddr: INSERT THE PUBLIC ADDRESS OF THE vLB HERE
- vpg_name_0: ziad1vdnspg01pg01
- repo_url_blob: https://nexus.onap.org/content/sites/raw
- repo_url_artifacts: https://nexus.onap.org/content/groups/staging
- demo_artifacts_version: 1.1.0
- install_script_version: 1.1.0-SNAPSHOT
- key_name: dns_packetgen_key
- pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
- cloud_env: PUT THE CLOUD ENVIRONMENT HERE (rackspace or openstack)
diff --git a/heat/vLB/packet_gen_vlb.yaml b/heat/vLB/packet_gen_vlb.yaml
deleted file mode 100644
index e41ede8e..00000000
--- a/heat/vLB/packet_gen_vlb.yaml
+++ /dev/null
@@ -1,146 +0,0 @@
-##########################################################################
-#
-#==================LICENSE_START==========================================
-#
-#
-# Copyright © 2017 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============================================
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-#
-##########################################################################
-
-heat_template_version: 2013-05-23
-
-description: Heat template to deploy a packet generator for the vLoadBalancer/vDNS demo app for ONAP
-
-##############
-# #
-# PARAMETERS #
-# #
-##############
-
-parameters:
- public_net_id:
- type: string
- label: Public network name or ID
- description: Public network that enables remote connection to VNF
- vpg_image_name:
- type: string
- label: Image name or ID
- description: Image to be used for compute instance
- vpg_flavor_name:
- type: string
- label: Flavor
- description: Type of instance (flavor) to be used
- vpg_name_0:
- type: string
- label: vPacketGenerator name
- description: Name of the vPacketGenerator
- key_name:
- type: string
- label: Key pair name
- description: Public/Private key pair name
- pub_key:
- type: string
- label: Public key
- description: Public key to be installed on the compute instance
- repo_url_blob:
- type: string
- label: Repository URL
- description: URL of the repository that hosts the demo packages
- repo_url_artifacts:
- type: string
- label: Repository URL
- description: URL of the repository that hosts the demo packages
- vlb_ipaddr:
- type: string
- label: Public IP of the vLoadBalancer to which we want to send traffic
- description: Public IP of the vLoadBalancer to which we want to send traffic
- install_script_version:
- type: string
- label: Installation script version number
- description: Version number of the scripts that install the vFW demo app
- demo_artifacts_version:
- type: string
- label: Artifacts version used in demo vnfs
- description: Artifacts (jar, tar.gz) version used in demo vnfs
- cloud_env:
- type: string
- label: Cloud environment
- description: Cloud environment (e.g., openstack, rackspace)
-
-#############
-# #
-# RESOURCES #
-# #
-#############
-
-resources:
-
- random-str:
- type: OS::Heat::RandomString
- properties:
- length: 4
-
- my_keypair:
- type: OS::Nova::KeyPair
- properties:
- name:
- str_replace:
- template: base_rand
- params:
- base: { get_param: key_name }
- rand: { get_resource: random-str }
- public_key: { get_param: pub_key }
- save_private_key: false
-
-
- vpg_0:
- type: OS::Nova::Server
- properties:
- image: { get_param: vpg_image_name }
- flavor: { get_param: vpg_flavor_name }
- name: { get_param: vpg_name_0 }
- key_name: { get_resource: my_keypair }
- networks:
- - network: { get_param: public_net_id }
- user_data_format: RAW
- user_data:
- str_replace:
- params:
- __repo_url_blob__ : { get_param: repo_url_blob }
- __repo_url_artifacts__ : { get_param: repo_url_artifacts }
- __vlb_ipaddr__: { get_param: vlb_ipaddr }
- __demo_artifacts_version__ : { get_param: demo_artifacts_version }
- __install_script_version__ : { get_param: install_script_version }
- __cloud_env__: { get_param: cloud_env }
- template: |
- #!/bin/bash
-
- # Create configuration files
- mkdir /opt/config
- echo "__vlb_ipaddr__" > /opt/config/vlb_ipaddr.txt
- echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt
- echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
- echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
- echo "__install_script_version__" > /opt/config/install_script_version.txt
- echo "__cloud_env__" > /opt/config/cloud_env.txt
-
- # Download and run install script
- curl -k __repo_url_blob__/org.onap.demo/vnfs/vlb/__install_script_version__/v_packetgen_install.sh -o /opt/v_packetgen_install.sh
- cd /opt
- chmod +x v_packetgen_install.sh
- ./v_packetgen_install.sh \ No newline at end of file