diff options
Diffstat (limited to 'heat/vCPE/vgw')
| -rw-r--r-- | heat/vCPE/vgw/MANIFEST.json | 4 | ||||
| -rw-r--r-- | heat/vCPE/vgw/base_vcpe_vgw.env (renamed from heat/vCPE/vgw/base_vcpe_vgw_rackspace.env) | 14 | ||||
| -rw-r--r-- | heat/vCPE/vgw/base_vcpe_vgw.yaml (renamed from heat/vCPE/vgw/base_vcpe_vgw_rackspace.yaml) | 16 |
3 files changed, 21 insertions, 13 deletions
diff --git a/heat/vCPE/vgw/MANIFEST.json b/heat/vCPE/vgw/MANIFEST.json index edaface7..f99303e4 100644 --- a/heat/vCPE/vgw/MANIFEST.json +++ b/heat/vCPE/vgw/MANIFEST.json @@ -3,12 +3,12 @@ "description": "", "data": [ { - "file": "base_vcpe_vgw_rackspace.yaml", + "file": "base_vcpe_vgw.yaml", "type": "HEAT", "isBase": "true", "data": [ { - "file": "base_vcpe_vgw_rackspace.env", + "file": "base_vcpe_vgw.env", "type": "HEAT_ENV" } ] diff --git a/heat/vCPE/vgw/base_vcpe_vgw_rackspace.env b/heat/vCPE/vgw/base_vcpe_vgw.env index c2a1b643..7c719221 100644 --- a/heat/vCPE/vgw/base_vcpe_vgw_rackspace.env +++ b/heat/vCPE/vgw/base_vcpe_vgw.env @@ -1,13 +1,15 @@ 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 mux_gw_private_net_id: zdfw1muxgw01_private + mux_gw_private_subnet_id: zdfw1muxgw01_sub_private mux_gw_private_net_cidr: 10.5.0.0/24 cpe_public_net_id: zdfw1cpe01_public + cpe_public_subnet_id: zdfw1cpe01_sub_public cpe_public_net_cidr: 10.2.0.0/24 - onap_private_net_id: <PUT_YOUR_ONAP_NET_ID_HERE> - onap_private_subnet_id: <PUT_YOUR_ONAP_NET_ID_HERE> + onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE + onap_private_subnet_id: PUT THE ONAP PRIVATE SUBNETWORK NAME HERE onap_private_net_cidr: 10.0.0.0/16 vgw_private_ip_0: 10.5.0.21 vgw_private_ip_1: 10.0.101.30 @@ -23,7 +25,7 @@ install_script_version: 1.1.0-SNAPSHOT key_name: vgw_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/vgw/base_vcpe_vgw_rackspace.yaml b/heat/vCPE/vgw/base_vcpe_vgw.yaml index d8fe4cde..173ba6dd 100644 --- a/heat/vCPE/vgw/base_vcpe_vgw_rackspace.yaml +++ b/heat/vCPE/vgw/base_vcpe_vgw.yaml @@ -24,7 +24,7 @@ heat_template_version: 2013-05-23 -description: Heat template to deploy vCPE vGateway (vG) for ONAP +description: Heat template to deploy vCPE vGateway (vG) ############## # # @@ -49,6 +49,10 @@ parameters: type: string label: vGMUX private network name or ID description: Private network that connects vGMUX to vGWs + mux_gw_private_subnet_id: + type: string + label: vGMUX private sub-network name or ID + description: vGMUX private sub-network name or ID mux_gw_private_net_cidr: type: string label: vGMUX private network CIDR @@ -69,6 +73,10 @@ parameters: type: string label: vCPE network that emulates internetmanagement name or ID description: Private network that connects vGW to emulated internet + cpe_public_subnet_id: + type: string + label: vCPE Public subnet + description: vCPE Public subnet cpe_public_net_cidr: type: string label: vCPE public network CIDR @@ -176,13 +184,11 @@ resources: save_private_key: false # Virtual GW Instantiation - # mux_gw_private_net created by mux heat template - # cpe_public_net created by infra heat template (vDNS) vgw_private_0_port: type: OS::Neutron::Port properties: network: { get_param: mux_gw_private_net_id } - fixed_ips: [{"subnet": { get_param: mux_gw_private_net_id }, "ip_address": { get_param: vgw_private_ip_0 }}] + fixed_ips: [{"subnet": { get_param: mux_gw_private_subnet_id }, "ip_address": { get_param: vgw_private_ip_0 }}] vgw_private_1_port: type: OS::Neutron::Port @@ -194,7 +200,7 @@ resources: type: OS::Neutron::Port properties: network: { get_param: cpe_public_net_id} - fixed_ips: [{"subnet": { get_param: cpe_public_net_id }, "ip_address": { get_param: vgw_private_ip_2 }}] + fixed_ips: [{"subnet": { get_param: cpe_public_subnet_id }, "ip_address": { get_param: vgw_private_ip_2 }}] vgw_0: type: OS::Nova::Server |