diff options
| author |   Marco Platania <platania@research.att.com> | 2017-08-08 11:37:49 -0400 |
|---|---|---|
| committer | Marco Platania <platania@research.att.com> | 2017-08-08 11:37:49 -0400 |
| commit | 4e560cd743de2cb8d6e302454e9d3f0aefec10c0 (patch) | |
| tree | 4b75de072f7fa8490f04635348bea5316568ceb0 /heat/vCPE/infra | |
| parent | 0e3f08f62a8c61f6ee40131df123247c7c614f06 (diff) | |
Clean up vCPE Heat templates
Change-Id: I1227bb9751cec36cba2ba5e03d6f0ed302fb1489
Signed-off-by: Marco Platania <platania@research.att.com>
Diffstat (limited to 'heat/vCPE/infra')
| -rw-r--r-- | heat/vCPE/infra/base_vcpe_infra_rackspace.env | 5 | ||||
| -rw-r--r-- | heat/vCPE/infra/base_vcpe_infra_rackspace.yaml | 14 |
2 files changed, 8 insertions, 11 deletions
diff --git a/heat/vCPE/infra/base_vcpe_infra_rackspace.env b/heat/vCPE/infra/base_vcpe_infra_rackspace.env index 54e74d1e..80e01437 100644 --- a/heat/vCPE/infra/base_vcpe_infra_rackspace.env +++ b/heat/vCPE/infra/base_vcpe_infra_rackspace.env @@ -7,11 +7,10 @@ parameters: onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE cpe_signal_net_cidr: 10.4.0.0/24 - onap_private_net_cidr: 10.0.0.0/16 cpe_public_net_cidr: 10.2.0.0/24 - vdhcp_private_ip_0: 10.0.4.1 + vdhcp_private_ip_0: 10.4.0.1 vdhcp_private_ip_1: 10.0.101.1 - vaaa_private_ip_0: 10.0.4.2 + vaaa_private_ip_0: 10.4.0.2 vaaa_private_ip_1: 10.0.101.2 vdns_private_ip_0: 10.2.0.1 vdns_private_ip_1: 10.0.101.3 diff --git a/heat/vCPE/infra/base_vcpe_infra_rackspace.yaml b/heat/vCPE/infra/base_vcpe_infra_rackspace.yaml index 914a202b..4c039538 100644 --- a/heat/vCPE/infra/base_vcpe_infra_rackspace.yaml +++ b/heat/vCPE/infra/base_vcpe_infra_rackspace.yaml @@ -65,17 +65,13 @@ parameters: type: string label: vAAA private network CIDR description: The CIDR of the vAAA private network - onap_private_net_cidr: - type: string - label: ONAP private network CIDR - description: The CIDR of the protected private network cpe_public_net_cidr: type: string label: vCPE public network CIDR description: The CIDR of the vCPE public vaaa_private_ip_0: type: string - label: vAAA private IP address towards the private network + label: vAAA private IP address towards the CPE_SIGNAL private network description: Private IP address that is assigned to the vAAA to communicate with the vCPE components vaaa_private_ip_1: type: string @@ -83,7 +79,7 @@ parameters: description: Private IP address that is assigned to the vAAA to communicate with ONAP components vdns_private_ip_0: type: string - label: vDNS private IP address towards the private network + label: vDNS private IP address towards the CPE_PUBLIC private network description: Private IP address that is assigned to the vDNS to communicate with the vCPE components vdns_private_ip_1: type: string @@ -91,7 +87,7 @@ parameters: description: Private IP address that is assigned to the vDNS to communicate with ONAP components vdhcp_private_ip_0: type: string - label: vDHCP private IP address towards the private network + label: vDHCP private IP address towards the CPE_SIGNAL private network description: Private IP address that is assigned to the vDHCP to communicate with the vCPE components vdhcp_private_ip_1: type: string @@ -99,7 +95,7 @@ parameters: description: Private IP address that is assigned to the vDHCP to communicate with ONAP components vweb_private_ip_0: type: string - label: vWEB private IP address towards the vGW + label: vWEB private IP address towards the CPE_PUBLIC private network description: Private IP address that is assigned to the vWEB to communicate with the vGWs vweb_private_ip_1: type: string @@ -195,6 +191,7 @@ resources: type: OS::Neutron::Net properties: name: { get_param: cpe_signal_net_id } + cpe_signal_subnet: type: OS::Neutron::Subnet properties: @@ -206,6 +203,7 @@ resources: type: OS::Neutron::Net properties: name: { get_param: cpe_public_net_id } + cpe_public_subnet: type: OS::Neutron::Subnet properties: |