diff options
| author |   Marco Platania <platania@research.att.com> | 2018-07-16 14:32:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-07-16 14:32:23 +0000 |
| commit | e8cb52b80d4fb40810c455d9948e146e0ec79c19 (patch) | |
| tree | d1ae18c15254fedb412c7823fda8b0320dc73f4c /heat/vCPE/vbrgemu | |
| parent | 0f3dca97a491e2ee97206ad496e85b5071e1e2f2 (diff) | |
| parent | e174762404a1c5c8c238428bc2e33e845a0c5941 (diff) | |
Merge "Fix subnet to use dhcp not preload"
Diffstat (limited to 'heat/vCPE/vbrgemu')
| -rw-r--r-- | heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env | 2 | ||||
| -rw-r--r-- | heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml | 12 |
2 files changed, 8 insertions, 6 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 |