Merge "Fix subnet to use dhcp not preload"

4 files changed, 17 insertions, 12 deletions

diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env
index 788a25c8..e18fbc20 100644
--- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env
+++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env
@@ -8,7 +8,7 @@
   vbrgemu_bng_private_net_cidr: 10.3.0.0/24
   #vbrgemu_private_net_id: zdfw1vbrgemu01_private
   #vbrgemu_private_net_cidr: 192.168.1.0/24
-  vbrgemu_private_ip_0: 10.3.0.4
+  ##vbrgemu_private_ip_0: 10.3.0.4
   #vbrgemu_private_ip_1: 192.168.1.1
   sdnc_ip: 10.0.7.1
   vbrgemu_name_0: zdcpe1cpe01brgemu01
diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml
index 50d79022..52941794 100644
--- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml
+++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml
@@ -67,10 +67,11 @@ parameters:
   #  type: string
   #  label: vBRGEMU Home private network CIDR
   #  description: The CIDR of the input side of vBRGEMU Home private network
-  vbrgemu_private_ip_0:
-    type: string
-    label: vGW private IP address
-    description: Private IP address towards the BRGEMU-BNG network
+##  vbrgemu_private_ip_0:
+##    type: string
+##    label: vGW private IP address
+##    description: Private IP address towards the BRGEMU-BNG network
+##    VPP will use DHCP so does not need to be provided by preload
   #vbrgemu_private_ip_1:
   #  type: string
   #  label: vGW private IP address
@@ -186,7 +187,8 @@ resources:
     type: OS::Neutron::Port
     properties:
       network: { get_param: vbrgemu_bng_private_net_id }
-      fixed_ips: [{"subnet": { get_param: vbrgemu_bng_private_subnet_id }, "ip_address": { get_param: vbrgemu_private_ip_0 }}]
+      fixed_ips: [{"subnet": { get_param: vbrgemu_bng_private_subnet_id }}]
+  ##    fixed_ips: [{"subnet": { get_param: vbrgemu_bng_private_subnet_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.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