updated vagrant to ubuntu20 and fixed network discovery to account fo…

…r other possible interface names (confluentinc#328)
gousteris · Aug 30, 2023 · e62f1c4 · e62f1c4
1 parent 237d7e8
commit e62f1c4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -23,7 +23,7 @@ VAGRANTFILE_API_VERSION = "2"
 enable_dns = false
 num_workers = 3
 ram_megabytes = 300
-base_box = "ubuntu/trusty64"
+base_box = "ubuntu/focal64"
 
 local_config_file = File.join(File.dirname(__FILE__), "Vagrantfile.local")
 if File.exists?(local_config_file) then

diff --git a/ducktape/cluster/linux_remoteaccount.py b/ducktape/cluster/linux_remoteaccount.py
@@ -47,7 +47,8 @@ def get_external_accessible_network_devices(self):
             device
             for device in self.get_network_devices()
             if device != 'lo'  # do not include local device
-            and ("eth" in device or "ens" in device)  # filter out other devices
+            and (device.startswith("en") or device.startswith('eth'))  # filter out other devices; "en" means ethernet
+            # eth0 can also sometimes happen, see https://unix.stackexchange.com/q/134483
         ]
 
     # deprecated, please use the self.externally_routable_ip that is set in your cluster,