Commit c9952e7d authored by David Johnson's avatar David Johnson

Use real physical control net device in /var/emulab/boot/controlif .

Somehow we had decided to to put br-ex into this file.  That is
technically correct, but not from slothd's perspective, since virtual
interfaces can plug into br-ex but not inject traffic from the host
br-ex interface... so we miss that traffic.  And we can't miss it.

(We still stash br-ex into /var/run/cnet... creating this mixed message
is not ideal, but we have to fix the slothd control net data collection
issue, which means lying to /var/emulab/boot/controlif.)
parent d3668141
......@@ -115,7 +115,7 @@ iface ${EXTERNAL_NETWORK_BRIDGE} inet static
dns-search $DNSDOMAIN
dns-nameservers $DNSSERVER
up echo "${EXTERNAL_NETWORK_BRIDGE}" > /var/run/cnet
up echo "${EXTERNAL_NETWORK_BRIDGE}" > /var/emulab/boot/controlif
up echo "${EXTERNAL_NETWORK_INTERFACE}" > /var/emulab/boot/controlif
EOF
else
mv /etc/udev/rules.d/99-emulab-networkd.rules \
......@@ -149,7 +149,7 @@ EOF
# that were previously done in /etc/network/interfaces via "up" hook.
#
echo "${EXTERNAL_NETWORK_BRIDGE}" > /var/run/cnet
echo "${EXTERNAL_NETWORK_BRIDGE}" > /var/emulab/boot/controlif
echo "${EXTERNAL_NETWORK_INTERFACE}" > /var/emulab/boot/controlif
EOF
chmod 755 $OURDIR/testbed-pre-static-control-network.sh
systemctl daemon-reload
......@@ -182,7 +182,7 @@ fi
# Also restart slothd so it listens on the new control iface.
echo "${EXTERNAL_NETWORK_BRIDGE}" > /var/run/cnet
echo "${EXTERNAL_NETWORK_BRIDGE}" > /var/emulab/boot/controlif
echo "${EXTERNAL_NETWORK_INTERFACE}" > /var/emulab/boot/controlif
/usr/local/etc/emulab/rc/rc.slothd stop
pkill slothd
sleep 1
......
......@@ -126,7 +126,7 @@ iface ${EXTERNAL_NETWORK_BRIDGE} inet static
dns-search $DNSDOMAIN
dns-nameservers $DNSSERVER
up echo "${EXTERNAL_NETWORK_BRIDGE}" > /var/run/cnet
up echo "${EXTERNAL_NETWORK_BRIDGE}" > /var/emulab/boot/controlif
up echo "${EXTERNAL_NETWORK_INTERFACE}" > /var/emulab/boot/controlif
$readdflows
auto ${EXTERNAL_NETWORK_INTERFACE}
......@@ -165,7 +165,7 @@ EOF
# that were previously done in /etc/network/interfaces via "up" hook.
#
echo "${EXTERNAL_NETWORK_BRIDGE}" > /var/run/cnet
echo "${EXTERNAL_NETWORK_BRIDGE}" > /var/emulab/boot/controlif
echo "${EXTERNAL_NETWORK_INTERFACE}" > /var/emulab/boot/controlif
EOF
chmod 755 $OURDIR/testbed-pre-static-control-network.sh
systemctl daemon-reload
......@@ -223,7 +223,7 @@ service_restart openvswitch-switch
# Also restart slothd so it listens on the new control iface.
echo "${EXTERNAL_NETWORK_BRIDGE}" > /var/run/cnet
echo "${EXTERNAL_NETWORK_BRIDGE}" > /var/emulab/boot/controlif
echo "${EXTERNAL_NETWORK_INTERFACE}" > /var/emulab/boot/controlif
/usr/local/etc/emulab/rc/rc.slothd stop
pkill slothd
sleep 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment