From 4d0559c09e94e95fc24e4f06e7c49c261bbdf8e3 Mon Sep 17 00:00:00 2001 From: Leigh B Stoller Date: Thu, 27 Sep 2018 15:18:11 -0600 Subject: [PATCH] Kill the static routes to Mothership boss/network, once we cut the cord, these routes break contact with the Mothership --- install/phases/boss/powder-fixed | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/install/phases/boss/powder-fixed b/install/phases/boss/powder-fixed index 5f79ddf50..bcb07acf5 100644 --- a/install/phases/boss/powder-fixed +++ b/install/phases/boss/powder-fixed @@ -311,24 +311,26 @@ sub Install($$$) # Going to lose all static routes below, so add this back. push(@strings, "static_routes=\"\$static_routes frisbee vnodes\""); + # Nat config. + push(@strings, + "pf_enable=\"YES\"", "pf_rules=\"/etc/pf.nat\""); # # This stuff is for development inside the Mothership. # - # Outer Emulab control network. - push(@strings, + if (0) { + # Outer Emulab control network. + push(@strings, "ifconfig_xn0_alias2=$outerctrl"); - # Route to outer boss and outer control networks - push(@strings, - "route_outeremulab=\"-net 155.98.36.0 ". - "-netmask 255.255.252.0 155.98.36.1\""); - push(@strings, - "route_outerboss=\"155.98.32.70 155.98.36.1\""); - push(@strings, - "static_routes=\"\$static_routes outerboss outerboss\""); - # Nat config. - push(@strings, - "pf_enable=\"YES\"", "pf_rules=\"/etc/pf.nat\""); + # Route to outer boss and outer control networks + push(@strings, + "route_outeremulab=\"-net 155.98.36.0 ". + "-netmask 255.255.252.0 155.98.36.1\""); + push(@strings, + "route_outerboss=\"155.98.32.70 155.98.36.1\""); + push(@strings, + "static_routes=\"\$static_routes outerboss outerboss\""); + } # # Okay, we want to comment out a bunch of stuff. -- GitLab