summaryrefslogtreecommitdiffstats
path: root/heat/vCPE/infra
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2017-09-26 11:45:00 -0400
committerMarco Platania <platania@research.att.com>2017-09-26 11:45:00 -0400
commitcf827dae0153c85ccf555239d12e30eb84752688 (patch)
treea8a84f73d6ceea02389b14061af7c513eb3cebd4 /heat/vCPE/infra
parent60dcae5d3001be59e013684c6cd03b6fe7ed48bf (diff)
Take out private networks from vCPE Heat templates
- Take out shared networks (use network templates in SO) - Remove rackspace from templates name - Modify MANIFEST files accordingly Change-Id: I43f778eff74cf525b5ad7628ccdc38dfab7d0ef4 Issue-ID: UCA-32 Signed-off-by: Marco Platania <platania@research.att.com>
Diffstat (limited to 'heat/vCPE/infra')
-rw-r--r--heat/vCPE/infra/MANIFEST.json4
-rw-r--r--heat/vCPE/infra/base_vcpe_infra.env (renamed from heat/vCPE/infra/base_vcpe_infra_rackspace.env)12
-rw-r--r--heat/vCPE/infra/base_vcpe_infra.yaml (renamed from heat/vCPE/infra/base_vcpe_infra_rackspace.yaml)50
3 files changed, 26 insertions, 40 deletions
diff --git a/heat/vCPE/infra/MANIFEST.json b/heat/vCPE/infra/MANIFEST.json
index 7c4780d6..11ce42f9 100644
--- a/heat/vCPE/infra/MANIFEST.json
+++ b/heat/vCPE/infra/MANIFEST.json
@@ -3,12 +3,12 @@
"description": "",
"data": [
{
- "file": "base_vcpe_infra_rackspace.yaml",
+ "file": "base_vcpe_infra.yaml",
"type": "HEAT",
"isBase": "true",
"data": [
{
- "file": "base_vcpe_infra_rackspace.env",
+ "file": "base_vcpe_infra.env",
"type": "HEAT_ENV"
}
]
diff --git a/heat/vCPE/infra/base_vcpe_infra_rackspace.env b/heat/vCPE/infra/base_vcpe_infra.env
index 689d1cf0..1d5ce3a8 100644
--- a/heat/vCPE/infra/base_vcpe_infra_rackspace.env
+++ b/heat/vCPE/infra/base_vcpe_infra.env
@@ -1,11 +1,13 @@
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
cpe_signal_net_id: zdfw1cpe01_private
+ cpe_signal_subnet_id: zdfw1cpe01_sub_private
cpe_public_net_id: zdfw1cpe01_public
+ cpe_public_subnet_id: zdfw1cpe01_sub_public
onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
- onap_private_subnet_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
cpe_signal_net_cidr: 10.4.0.0/24
cpe_public_net_cidr: 10.2.0.0/24
@@ -32,4 +34,4 @@ parameters:
install_script_version: 1.1.0-SNAPSHOT
key_name: vaaa_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)
diff --git a/heat/vCPE/infra/base_vcpe_infra_rackspace.yaml b/heat/vCPE/infra/base_vcpe_infra.yaml
index c0a18756..c6349581 100644
--- a/heat/vCPE/infra/base_vcpe_infra_rackspace.yaml
+++ b/heat/vCPE/infra/base_vcpe_infra.yaml
@@ -24,7 +24,7 @@
heat_template_version: 2013-05-23
-description: Heat template to deploy vCPE Infrastructue emlements (vAAA, vDHCP, vDNS_DHCP, webServer_sink) for ONAP
+description: Heat template to deploy vCPE Infrastructue emlements (vAAA, vDHCP, vDNS_DHCP, webServer)
##############
# #
@@ -61,6 +61,10 @@ parameters:
type: string
label: vAAA private network name or ID
description: Private network that connects vAAA with vDNSs
+ cpe_signal_subnet_id:
+ type: string
+ label: CPE Signal subnet
+ description: CPE Signal subnet
cpe_signal_net_cidr:
type: string
label: vAAA private network CIDR
@@ -69,6 +73,10 @@ parameters:
type: string
label: vCPE Public network (emulates internet) name or ID
description: Private network that connects vGW to emulated internet
+ cpe_public_subnet_id:
+ type: string
+ label: CPE Public subnet
+ description: CPE Public subnet
cpe_public_net_cidr:
type: string
label: vCPE public network CIDR
@@ -195,37 +203,13 @@ resources:
public_key: { get_param: pub_key }
save_private_key: false
- cpe_signal_network:
- type: OS::Neutron::Net
- properties:
- name: { get_param: cpe_signal_net_id }
-
- cpe_signal_subnet:
- type: OS::Neutron::Subnet
- properties:
- name: { get_param: cpe_signal_net_id }
- network_id: { get_resource: cpe_signal_network }
- cidr: { get_param: cpe_signal_net_cidr }
-
- cpe_public_network:
- type: OS::Neutron::Net
- properties:
- name: { get_param: cpe_public_net_id }
-
- cpe_public_subnet:
- type: OS::Neutron::Subnet
- properties:
- name: { get_param: cpe_public_net_id }
- network_id: { get_resource: cpe_public_network }
- cidr: { get_param: cpe_public_net_cidr }
-
# Virtual AAA server Instantiation
vaaa_private_0_port:
type: OS::Neutron::Port
properties:
- network: { get_resource: cpe_signal_network }
- fixed_ips: [{"subnet": { get_resource: cpe_signal_subnet }, "ip_address": { get_param: vaaa_private_ip_0 }}]
+ network: { get_param: cpe_signal_net_id }
+ fixed_ips: [{"subnet": { get_param: cpe_signal_subnet_id }, "ip_address": { get_param: vaaa_private_ip_0 }}]
vaaa_private_1_port:
type: OS::Neutron::Port
@@ -288,8 +272,8 @@ resources:
vdns_private_0_port:
type: OS::Neutron::Port
properties:
- network: { get_resource: cpe_public_network }
- fixed_ips: [{"subnet": { get_resource: cpe_public_subnet }, "ip_address": { get_param: vdns_private_ip_0 }}]
+ network: { get_param: cpe_public_net_id }
+ fixed_ips: [{"subnet": { get_param: cpe_public_subnet_id }, "ip_address": { get_param: vdns_private_ip_0 }}]
vdns_private_1_port:
type: OS::Neutron::Port
@@ -348,8 +332,8 @@ resources:
vdhcp_private_0_port:
type: OS::Neutron::Port
properties:
- network: { get_resource: cpe_signal_network }
- fixed_ips: [{"subnet": { get_resource: cpe_signal_subnet }, "ip_address": { get_param: vdhcp_private_ip_0 }}]
+ network: { get_param: cpe_signal_net_id }
+ fixed_ips: [{"subnet": { get_param: cpe_signal_subnet_id }, "ip_address": { get_param: vdhcp_private_ip_0 }}]
vdhcp_private_1_port:
type: OS::Neutron::Port
@@ -409,8 +393,8 @@ resources:
vweb_private_0_port:
type: OS::Neutron::Port
properties:
- network: { get_resource: cpe_public_network }
- fixed_ips: [{"subnet": { get_resource: cpe_public_subnet }, "ip_address": { get_param: vweb_private_ip_0 }}]
+ network: { get_param: cpe_public_net_id }
+ fixed_ips: [{"subnet": { get_param: cpe_public_subnet_id }, "ip_address": { get_param: vweb_private_ip_0 }}]
vweb_private_1_port:
type: OS::Neutron::Port