diff options
| -rw-r--r-- | heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.env | 1 | ||||
| -rw-r--r-- | heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.yaml | 11 | ||||
| -rw-r--r-- | heat/vCPE/vgw/base_vcpe_vgw_rackspace.env | 1 | ||||
| -rw-r--r-- | heat/vCPE/vgw/base_vcpe_vgw_rackspace.yaml | 5 |
4 files changed, 15 insertions, 3 deletions
diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.env b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.env index f512bcde..0d4d894e 100644 --- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.env +++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.env @@ -6,6 +6,7 @@ vbrgemu_private_net_id: zdfw1vbrgemu01_private vbrgemu_bng_private_net_cidr: 10.3.0.0/24 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
vbrgemu_name_0: zdcpe11cpe01brgemu01 vnf_id: vCPE_Infrastructure_BGREMU_demo_app diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.yaml b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.yaml index c99da2ad..6f926eb5 100644 --- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.yaml +++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.yaml @@ -63,10 +63,14 @@ parameters: type: string label: vBRGEMU Home private network CIDR description: The CIDR of the input side of vBRGEMU Home private network - vbrgemu_private_ip_1: + vbrgemu_private_ip_0: type: string - label: vGW IN private IP address + label: vGW private IP address description: Private IP address towards the BRGEMU-BNG network + vbrgemu_private_ip_1: + type: string + label: vGW private IP address + description: Private IP address towards the BRGEMU private network vbrgemu_name_0: type: string label: vGW name @@ -146,11 +150,12 @@ resources: cidr: { get_param: vbrgemu_private_net_cidr } # Virtual BRG Emulator Instantiation - # 0_port should get IP address from DHCP discover through vBNG + # 0_port should get IP address from DHCP discover through vBNG once the VNF is running vbrgemu_private_0_port: 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 }}] vbrgemu_private_1_port: type: OS::Neutron::Port diff --git a/heat/vCPE/vgw/base_vcpe_vgw_rackspace.env b/heat/vCPE/vgw/base_vcpe_vgw_rackspace.env index 3842fc0d..33da8d73 100644 --- a/heat/vCPE/vgw/base_vcpe_vgw_rackspace.env +++ b/heat/vCPE/vgw/base_vcpe_vgw_rackspace.env @@ -11,6 +11,7 @@ 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 + vgw_private_ip_2: 10.2.0.2 vgw_name_0: zdcpe11cpe01gw01 vnf_id: vCPE_Infrastructure_GW_demo_app vf_module_id: vCPE_Customer_GW diff --git a/heat/vCPE/vgw/base_vcpe_vgw_rackspace.yaml b/heat/vCPE/vgw/base_vcpe_vgw_rackspace.yaml index 8fe5e59f..0621556a 100644 --- a/heat/vCPE/vgw/base_vcpe_vgw_rackspace.yaml +++ b/heat/vCPE/vgw/base_vcpe_vgw_rackspace.yaml @@ -81,6 +81,10 @@ parameters: type: string label: vGW private IP address towards the ONAP management network description: Private IP address that is assigned to the vGW to communicate with ONAP components + vgw_private_ip_2: + type: string + label: vGW private IP address towards the vCPE public network + description: Private IP address that is assigned to the vGW to communicate with vCPE public network vgw_name_0: type: string label: vGW name @@ -174,6 +178,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 }}] vgw_0: type: OS::Nova::Server |