diff options
| -rw-r--r-- | heat/vCPE/infra/base_vcpe_infra_rackspace.env | 2 | ||||
| -rw-r--r-- | heat/vCPE/vbng/base_vcpe_vbng_rackspace.env | 2 | ||||
| -rw-r--r-- | heat/vCPE/vbng/base_vcpe_vbng_rackspace.yaml | 2 | ||||
| -rw-r--r-- | heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.env | 2 | ||||
| -rw-r--r-- | heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.yaml | 2 | ||||
| -rw-r--r-- | heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.env | 4 | ||||
| -rw-r--r-- | heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.yaml | 8 | ||||
| -rw-r--r-- | heat/vCPE/vgw/base_vcpe_vgw_rackspace.yaml | 2 |
8 files changed, 12 insertions, 12 deletions
diff --git a/heat/vCPE/infra/base_vcpe_infra_rackspace.env b/heat/vCPE/infra/base_vcpe_infra_rackspace.env index c1a75d21..4de60903 100644 --- a/heat/vCPE/infra/base_vcpe_infra_rackspace.env +++ b/heat/vCPE/infra/base_vcpe_infra_rackspace.env @@ -6,7 +6,7 @@ parameters: cpe_public_net_id: zdfw1cpe01_public onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE - onap_cidr: 10.0.0.0/16 + onap_private_net_cidr: 10.0.0.0/16 cpe_signal_net_cidr: 10.4.0.0/24 cpe_public_net_cidr: 10.2.0.0/24 vdhcp_private_ip_0: 10.4.0.1 diff --git a/heat/vCPE/vbng/base_vcpe_vbng_rackspace.env b/heat/vCPE/vbng/base_vcpe_vbng_rackspace.env index 6d73cc9d..e50d4834 100644 --- a/heat/vCPE/vbng/base_vcpe_vbng_rackspace.env +++ b/heat/vCPE/vbng/base_vcpe_vbng_rackspace.env @@ -7,7 +7,7 @@ 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 - cpe_signal_net_id: <PUT_YOUR_CPE_SIGNAL_NET_ID_HERE> + cpe_signal_net_id: zdfw1cpe01_private brgemu_bng_private_net_cidr: 10.3.0.0/24 bng_gmux_private_net_cidr: 10.1.0.0/24 cpe_signal_private_net_cidr: 10.4.0.0/24 diff --git a/heat/vCPE/vbng/base_vcpe_vbng_rackspace.yaml b/heat/vCPE/vbng/base_vcpe_vbng_rackspace.yaml index 2d5f8909..d5c0eed8 100644 --- a/heat/vCPE/vbng/base_vcpe_vbng_rackspace.yaml +++ b/heat/vCPE/vbng/base_vcpe_vbng_rackspace.yaml @@ -176,7 +176,7 @@ resources: properties: name: { get_param: brgemu_bng_private_net_id } - brgemu_bng_in_private_subnet: + brgemu_bng_private_subnet: type: OS::Neutron::Subnet properties: name: { get_param: brgemu_bng_private_net_id } diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.env b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.env index 519a0780..f512bcde 100644 --- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.env +++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.env @@ -2,7 +2,7 @@ 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 - vbrgemu_bng_private_net_id: zdfw1brgemubng01_private + vbrgemu_bng_private_net_id: zdfw1bngin01_private vbrgemu_private_net_id: zdfw1vbrgemu01_private vbrgemu_bng_private_net_cidr: 10.3.0.0/24 vbrgemu_private_net_cidr: 192.168.1.0/24 diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.yaml b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.yaml index f1e9c998..c99da2ad 100644 --- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.yaml +++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.yaml @@ -155,7 +155,7 @@ resources: vbrgemu_private_1_port: type: OS::Neutron::Port properties: - network: { get_param: vbrgemu_private_net_id } + network: { get_resource: vbrgemu_private_network } fixed_ips: [{"subnet": { get_resource: vbrgemu_private_subnet }, "ip_address": { get_param: vbrgemu_private_ip_1 }}] vbrgemu_0: 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 } diff --git a/heat/vCPE/vgw/base_vcpe_vgw_rackspace.yaml b/heat/vCPE/vgw/base_vcpe_vgw_rackspace.yaml index 5438a24f..8fe5e59f 100644 --- a/heat/vCPE/vgw/base_vcpe_vgw_rackspace.yaml +++ b/heat/vCPE/vgw/base_vcpe_vgw_rackspace.yaml @@ -161,7 +161,7 @@ resources: vgw_private_0_port: type: OS::Neutron::Port properties: - network: { get_param: mux_gw_private_net_id} + network: { get_param: mux_gw_private_net_id } fixed_ips: [{"subnet": { get_param: mux_gw_private_net_id }, "ip_address": { get_param: vgw_private_ip_0 }}] vgw_private_1_port: |