diff options
| author |   Marco Platania <platania@research.att.com> | 2017-08-11 08:10:51 -0400 |
|---|---|---|
| committer | Marco Platania <platania@research.att.com> | 2017-08-11 08:10:51 -0400 |
| commit | dab4c5e6fc3e2170896eb2df0196fe0cacbb25e0 (patch) | |
| tree | 1947ad1d5c41e7f45ea341dc3ee71cfd2b9c0654 /heat/vCPE/vgmux | |
| parent | 53d0828fca41263f09f710046503a742b76da29c (diff) | |
Fix network names in vCPE heat templates
Change-Id: I37b3574ec72c15481e2aee5ae8db7e5bff143a88
Signed-off-by: Marco Platania <platania@research.att.com>
Diffstat (limited to 'heat/vCPE/vgmux')
| -rw-r--r-- | heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.env | 4 | ||||
| -rw-r--r-- | heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.yaml | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.env b/heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.env index d4f37261..76dd86ef 100644 --- a/heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.env +++ b/heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.env @@ -2,12 +2,12 @@ vcpe_image_name: Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM) vcpe_flavor_name: 4 GB General Purpose v1 public_net_id: 00000000-0000-0000-0000-000000000000 - bng_mux_private_net_id: zdfw1bngmux01_private + bng_gmux_private_net_id: zdfw1bngmux01_private mux_gw_private_net_id: zdfw1muxgw01_private onap_private_net_id: <PUT_YOUR_ONAP_NET_ID_HERE> onap_private_subnet_id: <PUT_YOUR_ONAP_NET_ID_HERE> onap_private_net_cidr: 10.0.0.0/16 - bng_mux_private_net_cidr: 10.1.0.0/24 + bng_gmux_private_net_cidr: 10.1.0.0/24 mux_gw_private_net_cidr: 10.5.0.0/24 vgmux_private_ip_0: 10.1.0.20 vgmux_private_ip_1: 10.0.101.20 diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.yaml b/heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.yaml index 8b08e031..b6e212a1 100644 --- a/heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.yaml +++ b/heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.yaml @@ -45,11 +45,11 @@ parameters: type: string label: Public network name or ID description: Public network that enables remote connection to VNF - bng_mux_private_net_id: + bng_gmux_private_net_id: type: string label: vBNG vGMUX private network name or ID description: Private network that connects vBNG to vGMUX - bng_mux_private_net_cidr: + bng_gmux_private_net_cidr: type: string label: vBNG vGMUX private network CIDR description: The CIDR of the vBNG-vGMUX private network @@ -187,7 +187,7 @@ resources: vgmux_private_0_port: type: OS::Neutron::Port properties: - network: { get_resource: bng_mux_private_network } + network: { get_resource: bng_gmux_private_network } fixed_ips: [{"subnet": { get_resource: bng_gmux_private_subnet }, "ip_address": { get_param: vgmux_private_ip_0 }}] vgmux_private_1_port: @@ -222,7 +222,7 @@ resources: __bng_mux_net_ipaddr__ : { get_param: vgmux_private_ip_0 } __oam_ipaddr__ : { get_param: vgmux_private_ip_1 } __mux_gw_net_ipaddr__ : { get_param: vgmux_private_ip_2 } - __bng_mux_net_cidr__ : { get_param: bng_mux_private_net_cidr } + __bng_mux_net_cidr__ : { get_param: bng_gmux_private_net_cidr } __oam_cidr__ : { get_param: onap_private_net_cidr } __mux_gw_net_cidr__ : { get_param: mux_gw_private_net_cidr } __repo_url_blob__ : { get_param: repo_url_blob } |