aboutsummaryrefslogtreecommitdiffstats
path: root/heat/vCPE/vbrgemu
diff options
context:
space:
mode:
Diffstat (limited to 'heat/vCPE/vbrgemu')
-rw-r--r--heat/vCPE/vbrgemu/MANIFEST.json4
-rw-r--r--heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env (renamed from heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.env)11
-rw-r--r--heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml (renamed from heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.yaml)12
3 files changed, 16 insertions, 11 deletions
diff --git a/heat/vCPE/vbrgemu/MANIFEST.json b/heat/vCPE/vbrgemu/MANIFEST.json
index 0edc4b9d..603f92d9 100644
--- a/heat/vCPE/vbrgemu/MANIFEST.json
+++ b/heat/vCPE/vbrgemu/MANIFEST.json
@@ -3,12 +3,12 @@
"description": "",
"data": [
{
- "file": "base_vcpe_vbrgemu_rackspace.yaml",
+ "file": "base_vcpe_vbrgemu.yaml",
"type": "HEAT",
"isBase": "true",
"data": [
{
- "file": "base_vcpe_vbrgemu_rackspace.env",
+ "file": "base_vcpe_vbrgemu.env",
"type": "HEAT_ENV"
}
]
diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.env b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env
index 719e7c9b..c4496a76 100644
--- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.env
+++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env
@@ -1,10 +1,11 @@
parameters:
- vcpe_image_name: Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM)
- vcpe_flavor_name: 4 GB General Purpose v1
- public_net_id: 00000000-0000-0000-0000-000000000000
+ vcpe_image_name: PUT THE IMAGE NAME HERE (Ubuntu 1604 SUGGESTED)
+ vcpe_flavor_name: PUT THE FLAVOR NAME HERE (MEDIUM FLAVOR SUGGESTED)
+ public_net_id: PUT THE PUBLIC NETWORK ID HERE
vbrgemu_bng_private_net_id: zdfw1bngin01_private
- vbrgemu_private_net_id: zdfw1vbrgemu01_private
+ vbrgemu_bng_private_subnet_id: zdfw1bngin01_sub_private
vbrgemu_bng_private_net_cidr: 10.3.0.0/24
+ vbrgemu_private_net_id: zdfw1vbrgemu01_private
vbrgemu_private_net_cidr: 192.168.1.0/24
vbrgemu_private_ip_0: 10.3.0.2
vbrgemu_private_ip_1: 192.168.1.1
@@ -18,7 +19,7 @@
install_script_version: 1.1.0-SNAPSHOT
key_name: vbrgemu_key
pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
- cloud_env: rackspace
+ cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace)
vpp_source_repo_url: https://gerrit.fd.io/r/vpp
vpp_source_repo_branch: stable/1704
hc2vpp_source_repo_url: https://gerrit.fd.io/r/hc2vpp
diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.yaml b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml
index f56a7706..74096699 100644
--- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.yaml
+++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml
@@ -24,7 +24,7 @@
heat_template_version: 2013-05-23
-description: Heat template to deploy vCPE vBRG Emulator (vBRGEMU) for ONAP
+description: Heat template to deploy vCPE vBRG Emulator (vBRGEMU)
#######################################################################
# #
@@ -51,6 +51,10 @@ parameters:
type: string
label: vBNG private network name or ID
description: Private network that connects vBRGEMU to vBNG
+ vbrgemu_bng_private_subnet_id:
+ type: string
+ label: vBNG private sub-network name or ID
+ description: vBNG private sub-network name or ID
vbrgemu_bng_private_net_cidr:
type: string
label: vBNG IN private network CIDR
@@ -179,7 +183,7 @@ resources:
type: OS::Neutron::Port
properties:
network: { get_param: vbrgemu_bng_private_net_id }
- fixed_ips: [{"subnet": { get_param: vbrgemu_bng_private_net_id }, "ip_address": { get_param: vbrgemu_private_ip_0 }}]
+ fixed_ips: [{"subnet": { get_param: vbrgemu_bng_private_subnet_id }, "ip_address": { get_param: vbrgemu_private_ip_0 }}]
vbrgemu_private_1_port:
type: OS::Neutron::Port
@@ -216,7 +220,7 @@ resources:
__hc2vpp_source_repo_url__ : { get_param: hc2vpp_source_repo_url }
__hc2vpp_source_repo_branch__ : { get_param: hc2vpp_source_repo_branch }
__vpp_patch_url__ : { get_param: vpp_patch_url }
- __sdnc_ip__ : { get param: sdnc_ip }
+ __sdnc_ip__ : { get param: sdnc_ip }
template: |
#!/bin/bash
@@ -235,7 +239,7 @@ resources:
echo "__hc2vpp_source_repo_url__" > /opt/config/hc2vpp_source_repo_url.txt
echo "__hc2vpp_source_repo_branch__" > /opt/config/hc2vpp_source_repo_branch.txt
echo "__vpp_patch_url__" > /opt/config/vpp_patch_url.txt
- echo "__sdnc_ip__" > /opt/config/ip.txt
+ echo "__sdnc_ip__" > /opt/config/ip.txt
# Download and run install script
curl -k __repo_url_blob__/org.onap.demo/vnfs/vcpe/__install_script_version__/v_brgemu_install.sh -o /opt/v_brgemu_install.sh