airship/treasuremap
Code Issues Proposed changes

Merge "Updates vm-infra-bridge iptables vlan"

Browse Source
This commit is contained in:
Zuul 2021-05-21 18:11:06 +00:00 committed by Gerrit Code Review
commit 6026c86e4d
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/function/k8scontrol-vm-infra/vm-infra-bridge.yaml
View File

@ -44,10 +44,10 @@
# is to ensure that the octet is within the range of the OAM last octet. # is to ensure that the octet is within the range of the OAM last octet.
# TODO : Need to make the modulo value configurable for future release. # TODO : Need to make the modulo value configurable for future release.
mgmtoctet=$(($octet % 44)) mgmtoctet=$(($octet % 44))
vm_ip_address=$(awk -F"." '{print $1"."$2"."$3"."}'<<<"REPLACEMENT_VM_NETWORK")${mgmtoctet} vm_infra_ip_address=$(awk -F"." '{print $1"."$2"."$3"."}'<<<"REPLACEMENT_VM_NETWORK")${mgmtoctet}
echo "Going to use ${vm_ip_address}" echo "Going to use ${vm_infra_ip_address}"
# convert the subnet information to CIDR format # convert the subnet information to CIDR format
vm_ip_cidr=$(awk -F. '{ vm_infra_ip_cidr=$(awk -F. '{
split($0, octets) split($0, octets)
for (i in octets) { for (i in octets) {
mask += 8 - log(2**8 - octets[i])/log(2); mask += 8 - log(2**8 - octets[i])/log(2);
@ -58,9 +58,9 @@
if ! brctl show | grep -q vm-infra-bridge; then if ! brctl show | grep -q vm-infra-bridge; then
brctl addbr vm-infra-bridge brctl addbr vm-infra-bridge
ip link set vm-infra-bridge up ip link set vm-infra-bridge up
ip addr add ${vm_ip_address}${vm_ip_cidr} dev vm-infra-bridge ip addr add ${vm_infra_ip_address}${vm_infra_ip_cidr} dev vm-infra-bridge
brctl addif vm-infra-bridge REPLACEMENT_VM_INFRA_INTF brctl addif vm-infra-bridge REPLACEMENT_VM_INFRA_INTF
fi; fi;
# add iptables postrouting nat # add iptables postrouting nat
iptables -t nat -A POSTROUTING -s REPLACEMENT_VM_NETWORK${vm_ip_cidr} -o REPLACEMENT_VM_INFRA_INTF -j MASQUERADE iptables -t nat -A POSTROUTING -s REPLACEMENT_VM_NETWORK${vm_infra_ip_cidr} -o REPLACEMENT_MGMT_INTF -j MASQUERADE
exit 0 exit 0

10
manifests/function/vm-infra-bridge/dataplane/vm-infra-bridge.yaml
View File

@ -44,10 +44,10 @@
# is to ensure that the octet is within the range of the OAM last octet. # is to ensure that the octet is within the range of the OAM last octet.
# TODO : Need to make the modulo value configurable for future release. # TODO : Need to make the modulo value configurable for future release.
mgmtoctet=$(($octet % 44)) mgmtoctet=$(($octet % 44))
vm_ip_address=$(awk -F"." '{print $1"."$2"."$3"."}'<<<"REPLACEMENT_VM_NETWORK")${mgmtoctet} vm_infra_ip_address=$(awk -F"." '{print $1"."$2"."$3"."}'<<<"REPLACEMENT_VM_NETWORK")${mgmtoctet}
echo "Going to use ${vm_ip_address}" echo "Going to use ${vm_infra_ip_address}"
# convert the subnet information to CIDR format # convert the subnet information to CIDR format
vm_ip_cidr=$(awk -F. '{ vm_infra_ip_cidr=$(awk -F. '{
split($0, octets) split($0, octets)
for (i in octets) { for (i in octets) {
mask += 8 - log(2**8 - octets[i])/log(2); mask += 8 - log(2**8 - octets[i])/log(2);
@ -58,9 +58,9 @@
if ! brctl show | grep -q vm-infra-bridge; then if ! brctl show | grep -q vm-infra-bridge; then
brctl addbr vm-infra-bridge brctl addbr vm-infra-bridge
ip link set vm-infra-bridge up ip link set vm-infra-bridge up
ip addr add ${vm_ip_address}${vm_ip_cidr} dev vm-infra-bridge ip addr add ${vm_infra_ip_address}${vm_infra_ip_cidr} dev vm-infra-bridge
brctl addif vm-infra-bridge REPLACEMENT_VM_INFRA_INTF brctl addif vm-infra-bridge REPLACEMENT_VM_INFRA_INTF
fi; fi;
# add iptables postrouting nat # add iptables postrouting nat
iptables -t nat -A POSTROUTING -s REPLACEMENT_VM_NETWORK${vm_ip_cidr} -o REPLACEMENT_VM_INFRA_INTF -j MASQUERADE iptables -t nat -A POSTROUTING -s REPLACEMENT_VM_NETWORK${vm_infra_ip_cidr} -o REPLACEMENT_MGMT_INTF -j MASQUERADE
exit 0 exit 0

4
manifests/type/multi-tenant/shared/catalogues/vm-networking.yaml
View File

@ -6,7 +6,7 @@ metadata:
airshipit.org/deploy-k8s: "false" airshipit.org/deploy-k8s: "false"
spec: spec:
vm_infra_bridge: vm_infra_bridge:
host_oam_interface: bond0.41 host_oam_interface: bond0.61
vm_interface: bond0.45 vm_interface: bond0.66
vm_network: 192.168.0.0 vm_network: 192.168.0.0
vm_network_subnet_mask: 255.255.240.0 vm_network_subnet_mask: 255.255.240.0