diff options
| -rw-r--r-- | heat/vLBMS/base_vlb.yaml | 4 | ||||
| -rw-r--r-- | heat/vLBMS/dnsscaling.env | 2 | ||||
| -rw-r--r-- | heat/vLBMS/dnsscaling.yaml | 12 | ||||
| -rw-r--r-- | vnfs/vLBMS/scripts/set_gre_tunnel.sh | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/heat/vLBMS/base_vlb.yaml b/heat/vLBMS/base_vlb.yaml index bb6e57f2..9c9cb53b 100644 --- a/heat/vLBMS/base_vlb.yaml +++ b/heat/vLBMS/base_vlb.yaml @@ -333,7 +333,7 @@ resources: params: __lb_oam_int__: { get_param: vlb_private_ip_1 } __lb_private_ipaddr__: { get_param: vlb_private_ip_0 } - __lb_public_ipaddr__: { get_attr: [vlb_0, networks, { get_param: public_net_id }, 0]} + __lb_to_pktgen_if__: { get_param: vlb_private_ip_2} __local_private_ipaddr__: { get_param: vdns_private_ip_0 } __oam_private_ipaddr__: { get_param: vdns_private_ip_1 } __repo_url_blob__: { get_param: repo_url_blob } @@ -350,7 +350,7 @@ resources: mkdir /opt/config echo "__lb_oam_int__" > /opt/config/lb_oam_int.txt echo "__lb_private_ipaddr__" > /opt/config/lb_private_ipaddr.txt - echo "__lb_public_ipaddr__" > /opt/config/lb_public_ipaddr.txt + echo "__lb_to_pktgen_if__" > /opt/config/lb_to_pktgen_if.txt echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.txt echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt diff --git a/heat/vLBMS/dnsscaling.env b/heat/vLBMS/dnsscaling.env index 7c4eb656..f340837b 100644 --- a/heat/vLBMS/dnsscaling.env +++ b/heat/vLBMS/dnsscaling.env @@ -7,9 +7,9 @@ parameters: onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE vlb_private_net_cidr: 192.168.10.0/24 onap_private_net_cidr: PUT THE ONAP NETWORK CIDR HERE - vlb_public_ip: PUT THE PUBLIC IP OF THE LOAD BALANCER HERE vlb_private_ip_0: 192.168.10.111 vlb_private_ip_1: PUT THE PRIVATE ADDRESS OF THE VLB IN THE ONAP NETWORK SPACE HERE + vlb_private_ip_2: 192.168.9.111 vdns_private_ip_0: 192.168.10.212 vdns_private_ip_1: ASSIGN A PRIVATE ADDRESS IN THE ONAP NETWORK SPACE TO THE VDNS vdns_name_0: zdfw1lb01dns02 diff --git a/heat/vLBMS/dnsscaling.yaml b/heat/vLBMS/dnsscaling.yaml index 37afe8ee..518bcac3 100644 --- a/heat/vLBMS/dnsscaling.yaml +++ b/heat/vLBMS/dnsscaling.yaml @@ -65,10 +65,6 @@ parameters: type: string label: ONAP private network CIDR description: The CIDR of the protected private network - vlb_public_ip: - type: string - label: vLoadBalancer public IP address - description: Public IP address of the vLoadBalancer vlb_private_ip_0: type: string label: vLoadBalancer private IP address towards the private network @@ -77,6 +73,10 @@ parameters: type: string label: vLoadBalancer private IP address towards the ONAP management network description: Private IP address that is assigned to the vLoadBalancer to communicate with ONAP components + vlb_private_ip_2: + type: string + label: vLoadBalancer private IP address towards the vPacketGen network + description: Private IP address that is assigned to the vLoadBalancer to communicate with vPacketGen vdns_private_ip_0: type: string label: vDNS private IP address towards the private network @@ -181,7 +181,7 @@ resources: params: __lb_oam_int__: { get_param: vlb_private_ip_1 } __lb_private_ipaddr__: { get_param: vlb_private_ip_0 } - __lb_public_ipaddr__: { get_param: vlb_public_ip } + __lb_to_pktgen_if__: { get_param: vlb_private_ip_2} __local_private_ipaddr__: { get_param: vdns_private_ip_0 } __oam_private_ipaddr__: { get_param: vdns_private_ip_1 } __repo_url_blob__: { get_param: repo_url_blob } @@ -198,7 +198,7 @@ resources: mkdir /opt/config echo "__lb_oam_int__" > /opt/config/lb_oam_int.txt echo "__lb_private_ipaddr__" > /opt/config/lb_private_ipaddr.txt - echo "__lb_public_ipaddr__" > /opt/config/lb_public_ipaddr.txt + echo "__lb_to_pktgen_if__" > /opt/config/lb_to_pktgen_if.txt echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.txt echo "__repo_url_blob__" > /opt/config/repo_url_blob.txt diff --git a/vnfs/vLBMS/scripts/set_gre_tunnel.sh b/vnfs/vLBMS/scripts/set_gre_tunnel.sh index 186a00d9..d918211f 100644 --- a/vnfs/vLBMS/scripts/set_gre_tunnel.sh +++ b/vnfs/vLBMS/scripts/set_gre_tunnel.sh @@ -1,14 +1,14 @@ #!/bin/bash -LB_PUBLIC_IP=$(cat /opt/config/lb_public_ipaddr.txt) +LB_TO_PKTGEN_IF=$(cat /opt/config/lb_to_pktgen_if.txt) LB_PRIVATE_IP=$(cat /opt/config/lb_private_ipaddr.txt) MY_PRIVATE_IP=$(cat /opt/config/local_private_ipaddr.txt) -sed -i "s/x.x.x.x/"$LB_PUBLIC_IP"/g" /etc/bind/named.conf.options +sed -i "s/x.x.x.x/"$LB_TO_PKTGEN_IF"/g" /etc/bind/named.conf.options ip tunnel add gre123 mode gre remote $LB_PRIVATE_IP local $MY_PRIVATE_IP ttl 255 ip link set gre123 up -ip addr add $LB_PUBLIC_IP"/32" dev gre123 +ip addr add $LB_TO_PKTGEN_IF"/32" dev gre123 route add default dev gre123 ifconfig eth0 down |