Prefer netplan over ENI when both exist.

hatched · May 13, 2020 · b821c31 · b821c31
1 parent 0b123a9
commit b821c31
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/container/broker/instance_broker.go b/container/broker/instance_broker.go
@@ -121,11 +121,13 @@ func prepareHost(config Config) PrepareHostFunc {
 	}
 }
 
+// defaultBridger will prefer to use netplan if there is an /etc/netplan
+// directory, falling back to ENI if the directory doesn't exist.
 func defaultBridger() (network.Bridger, error) {
-	if _, err := os.Stat(systemSbinIfup); err == nil {
-		return network.DefaultEtcNetworkInterfacesBridger(activateBridgesTimeout, systemNetworkInterfacesFile)
-	} else {
+	if _, err := os.Stat(systemNetplanDirectory); err == nil {
 		return network.DefaultNetplanBridger(activateBridgesTimeout, systemNetplanDirectory)
+	} else {
+		return network.DefaultEtcNetworkInterfacesBridger(activateBridgesTimeout, systemNetworkInterfacesFile)
 	}
 }