diff options
| author |   Brian Freeman <bf1936@att.com> | 2018-07-12 08:11:29 -0500 |
|---|---|---|
| committer | Brian Freeman <bf1936@att.com> | 2018-07-12 08:11:56 -0500 |
| commit | e174762404a1c5c8c238428bc2e33e845a0c5941 (patch) | |
| tree | a4d0ae530087846d595fe8274bf0597dd9358e5f /heat/vCPE/vgw | |
| parent | d47f0cd6bb286fa013bcc1bf7321cdbc37cac400 (diff) | |
Fix subnet to use dhcp not preload
Issue-ID: TEST-104
Change-Id: I9d44f9617ca02546dbe9d7355ec4ded5eaba5d23
Signed-off-by: Brian Freeman <bf1936@att.com>
Diffstat (limited to 'heat/vCPE/vgw')
| -rw-r--r-- | heat/vCPE/vgw/base_vcpe_vgw.env | 3 | ||||
| -rw-r--r-- | heat/vCPE/vgw/base_vcpe_vgw.yaml | 12 |
2 files changed, 9 insertions, 6 deletions
diff --git a/heat/vCPE/vgw/base_vcpe_vgw.env b/heat/vCPE/vgw/base_vcpe_vgw.env index 5a08b91b..7bd918b5 100644 --- a/heat/vCPE/vgw/base_vcpe_vgw.env +++ b/heat/vCPE/vgw/base_vcpe_vgw.env @@ -13,7 +13,8 @@ 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.3 + ## VPP will use DHCP to get the vgw_private_ip_2 on the CPE_PUBLIC subnet + ## vgw_private_ip_2: 10.2.0.3 vgw_name_0: zdcpe1cpe01gw01 vnf_id: vCPE_Infrastructure_GW_demo_app vf_module_id: vCPE_Customer_GW diff --git a/heat/vCPE/vgw/base_vcpe_vgw.yaml b/heat/vCPE/vgw/base_vcpe_vgw.yaml index 07aa2174..02fd999f 100644 --- a/heat/vCPE/vgw/base_vcpe_vgw.yaml +++ b/heat/vCPE/vgw/base_vcpe_vgw.yaml @@ -89,10 +89,11 @@ 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 + ## VPP will use DHCP to get the vgw_private_ip_2 on the CPE_PUBLIC subnet + #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 @@ -208,7 +209,8 @@ resources: type: OS::Neutron::Port properties: network: { get_param: cpe_public_net_id} - fixed_ips: [{"subnet": { get_param: cpe_public_subnet_id }, "ip_address": { get_param: vgw_private_ip_2 }}] + fixed_ips: [{"subnet": { get_param: cpe_public_subnet_id }}] + ##fixed_ips: [{"subnet": { get_param: cpe_public_subnet_id }, "ip_address": { get_param: vgw_private_ip_2 }}] vgw_0: type: OS::Nova::Server |