aboutsummaryrefslogtreecommitdiffstats
path: root/heat/vCPE/vgw/base_vcpe_vgw.yaml
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2018-07-16 14:32:23 +0000
committerGerrit Code Review <gerrit@onap.org>2018-07-16 14:32:23 +0000
commite8cb52b80d4fb40810c455d9948e146e0ec79c19 (patch)
treed1ae18c15254fedb412c7823fda8b0320dc73f4c /heat/vCPE/vgw/base_vcpe_vgw.yaml
parent0f3dca97a491e2ee97206ad496e85b5071e1e2f2 (diff)
parente174762404a1c5c8c238428bc2e33e845a0c5941 (diff)
Merge "Fix subnet to use dhcp not preload"
Diffstat (limited to 'heat/vCPE/vgw/base_vcpe_vgw.yaml')
-rw-r--r--heat/vCPE/vgw/base_vcpe_vgw.yaml12
1 files changed, 7 insertions, 5 deletions
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