Use internal_interface instead of testbed_network_devices.management (#2504)

Signed-off-by: Christian Berendt <[email protected]>

Author: berendt

environments/custom/templates/workarounds.sh.j2

@@ -2,20 +2,20 @@
 
 {% if ansible_os_family == "Debian" and inventory_hostname_short != "testbed-manager" %}
 if [[ -e /usr/sbin/ifup ]]; then
-    ifdown {{ ansible_local.testbed_network_devices.management }} && ifup {{ ansible_local.testbed_network_devices.management }}
+    ifdown {{ internal_interface }} && ifup {{ internal_interface }}
 else
     netplan apply
 fi
 {% elif ansible_os_family == "RedHat" %}
-    ip link add vxlan0 type vxlan id 42 group 239.1.1.1 dstport 4789 dev {{ ansible_local.testbed_network_devices.management }}
+    ip link add vxlan0 type vxlan id 42 group 239.1.1.1 dstport 4789 dev {{ internal_interface }}
     ip addr add {{ '192.168.112.0/20' | ansible.utils.ipaddr('net') | ansible.utils.ipaddr(node_id) | ansible.utils.ipaddr('address') }}/20 dev vxlan0
     ip link set up dev vxlan0
 
-    ip link add vxlan1 type vxlan id 23 group 239.1.1.1 dstport 4789 dev {{ ansible_local.testbed_network_devices.management }}
+    ip link add vxlan1 type vxlan id 23 group 239.1.1.1 dstport 4789 dev {{ internal_interface }}
     ip addr add {{ '192.168.128.0/20' | ansible.utils.ipaddr('net') | ansible.utils.ipaddr(node_id) | ansible.utils.ipaddr('address') }}/20 dev vxlan1
     ip link set up dev vxlan1
 
-    iptables -A FORWARD -i {{ ansible_local.testbed_network_devices.management }} -j ACCEPT
-    iptables -A FORWARD -o {{ ansible_local.testbed_network_devices.management }} -j ACCEPT
-    iptables -t nat -A POSTROUTING -o {{ ansible_local.testbed_network_devices.management }} -j MASQUERADE
+    iptables -A FORWARD -i {{ internal_interface }} -j ACCEPT
+    iptables -A FORWARD -o {{ internal_interface }} -j ACCEPT
+    iptables -t nat -A POSTROUTING -o {{ internal_interface }} -j MASQUERADE
 {% endif %}

environments/openstack/playbook-bootstrap-basic.yml

@@ -7,22 +7,22 @@
       become: true
       ansible.builtin.iptables:
         chain: FORWARD
-        in_interface: "{{ ansible_local.testbed_network_devices.management }}"
+        in_interface: "{{ internal_interface }}"
         jump: ACCEPT
 
     - name: Accept FORWARD on the management interface (outgoing)
       become: true
       ansible.builtin.iptables:
         chain: FORWARD
-        out_interface: "{{ ansible_local.testbed_network_devices.management }}"
+        out_interface: "{{ internal_interface }}"
         jump: ACCEPT
 
     - name: Masquerade traffic on the management interface
       become: true
       ansible.builtin.iptables:
         table: nat
         chain: POSTROUTING
-        out_interface: "{{ ansible_local.testbed_network_devices.management }}"
+        out_interface: "{{ internal_interface }}"
         jump: MASQUERADE
 
 - name: Bootstrap basic OpenStack services

inventory/group_vars/testbed-managers.yml

@@ -34,7 +34,7 @@ netdata_host_type: server
 
 network_type: netplan
 network_ethernets:
-  "{{ ansible_local.testbed_network_devices.management }}":
+  "{{ internal_interface }}":
     dhcp4: true
     mtu: "{{ testbed_mtu_manager }}"
 network_dispatcher_scripts:
@@ -46,6 +46,6 @@ network_dispatcher_scripts:
 ##########################################################
 # kolla
 
-network_interface: "{{ ansible_local.testbed_network_devices.management }}"
+network_interface: "{{ internal_interface }}"
 k3s_interface: vxlan1
 flannel_iface: "{{ k3s_interface }}"

inventory/group_vars/testbed-nodes.yml

@@ -74,7 +74,7 @@ netdata_host_type: client
 network_type: netplan
 
 network_ethernets:
-  "{{ ansible_local.testbed_network_devices.management }}":
+  "{{ internal_interface }}":
     dhcp4: true
     mtu: "{{ testbed_mtu_node }}"
 
@@ -85,7 +85,7 @@ network_dispatcher_scripts:
 ##########################################################
 # kolla
 
-network_interface: "{{ ansible_local.testbed_network_devices.management }}"
+network_interface: "{{ internal_interface }}"
 k3s_interface: vxlan1
 flannel_iface: "{{ k3s_interface }}"
 neutron_external_interface: vxlan0

network/iptables.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-if [[ $IFACE == "{{ ansible_local.testbed_network_devices.management }}" ]]; then
-    iptables -A FORWARD -i {{ ansible_local.testbed_network_devices.management }} -j ACCEPT
-    iptables -A FORWARD -o {{ ansible_local.testbed_network_devices.management }} -j ACCEPT
-    iptables -t nat -A POSTROUTING -o {{ ansible_local.testbed_network_devices.management }} -j MASQUERADE
+if [[ $IFACE == "{{ internal_interface }}" ]]; then
+    iptables -A FORWARD -i {{ internal_interface }} -j ACCEPT
+    iptables -A FORWARD -o {{ internal_interface }} -j ACCEPT
+    iptables -t nat -A POSTROUTING -o {{ internal_interface }} -j MASQUERADE
 fi

network/vxlan.sh

@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 
-if [[ $IFACE == "{{ ansible_local.testbed_network_devices.management }}" ]]; then
-    ip link add vxlan0 type vxlan id 42 group 239.1.1.1 dstport 4789 dev {{ ansible_local.testbed_network_devices.management }}
+if [[ $IFACE == "{{ internal_interface }}" ]]; then
+    ip link add vxlan0 type vxlan id 42 group 239.1.1.1 dstport 4789 dev {{ internal_interface }}
     ip addr add {{ '192.168.112.0/20' | ansible.utils.ipaddr('net') | ansible.utils.ipaddr(node_id) | ansible.utils.ipaddr('address') }}/20 dev vxlan0
     ip link set up dev vxlan0
 
-    ip link add vxlan1 type vxlan id 23 group 239.1.1.1 dstport 4789 dev {{ ansible_local.testbed_network_devices.management }}
+    ip link add vxlan1 type vxlan id 23 group 239.1.1.1 dstport 4789 dev {{ internal_interface }}
     ip addr add {{ '192.168.128.0/20' | ansible.utils.ipaddr('net') | ansible.utils.ipaddr(node_id) | ansible.utils.ipaddr('address') }}/20 dev vxlan1
     ip link set up dev vxlan1
 fi