From 58c7890bfcce31be2a4b277e07c98e61e489c469 Mon Sep 17 00:00:00 2001 From: Dave Wilde Date: Thu, 25 Oct 2018 20:13:34 -0500 Subject: [PATCH] MNAIO: flat networking fixes With the switch to systemd-networkd the veth pairs for flat networking and lbaas aren't created. This creates veth pairs if the server has the appropriate server_networks defined. * Create the veth network files With this simple Match directive networkd will bring the interface up. Change-Id: I0ae4375be128594a861c18aa33a98378859dd9d3 --- .../systemd-networkd/systemd-network.sh.j2 | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/multi-node-aio/playbooks/pxe/configs/systemd-networkd/systemd-network.sh.j2 b/multi-node-aio/playbooks/pxe/configs/systemd-networkd/systemd-network.sh.j2 index f382330c..9c811cf7 100644 --- a/multi-node-aio/playbooks/pxe/configs/systemd-networkd/systemd-network.sh.j2 +++ b/multi-node-aio/playbooks/pxe/configs/systemd-networkd/systemd-network.sh.j2 @@ -49,4 +49,55 @@ UseNTP=yes Address={{ value.address }} {% endif %} EOF + +# generate files for flat networking +{% if value.iface is defined and key == "flat" %} +cat </etc/systemd/network/br-veth-{{ key }}.netdev +[NetDev] +Name=v{{ value.iface }} +Kind=veth + +[Peer] +Name=br-veth-{{ key }} +EOF + +cat </etc/systemd/network/br-veth-{{ key }}.network +[Match] +Name=br-veth-{{ key }} + +[Network] +Bridge=br-{{ key }} +ConfigureWithoutCarrier=yes +EOF + +cat </etc/systemd/network/v{{ value.iface }}.network +[Match] +Name=v{{ value.iface }} +EOF +{% endif %} + +# generate files for lbaas +{% if value.iface is defined and key == "lbaas" %} +cat </etc/systemd/network/br-veth-{{ key }}.netdev +[NetDev] +Name=v{{ value.iface }} +Kind=veth + +[Peer] +Name=br-veth-{{ key }} +EOF + +cat </etc/systemd/network/br-veth-{{ key }}.network +[Match] +Name=br-veth-{{ key }} + +[Network] +Bridge=br-{{ key }} +ConfigureWithoutCarrier=yes +EOF +cat </etc/systemd/network/v{{ value.iface }}.network +[Match] +Name=v{{ value.iface }} +EOF +{% endif %} {% endfor %}