From e174762404a1c5c8c238428bc2e33e845a0c5941 Mon Sep 17 00:00:00 2001 From: Brian Freeman Date: Thu, 12 Jul 2018 08:11:29 -0500 Subject: Fix subnet to use dhcp not preload Issue-ID: TEST-104 Change-Id: I9d44f9617ca02546dbe9d7355ec4ded5eaba5d23 Signed-off-by: Brian Freeman --- heat/vCPE/vgw/base_vcpe_vgw.yaml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'heat/vCPE/vgw/base_vcpe_vgw.yaml') 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 -- cgit 1.2.3-korg