Merge pull request #300 from innogames/l_trixie_migrations

Adjustments for Trixie Migrations

Author: lamaral

igvm/hypervisor.py

@@ -914,7 +914,7 @@ def format_storage(self, device, options):
 
     def check_netcat(self, port):
         pid = self.run(
-            'pgrep -f "^/bin/nc.openbsd -l -p {}"'
+            'pgrep -f "^/bin/nc.openbsd -6 -l -p {}"'
             .format(port),
             warn_only=True,
             silent=True
@@ -927,7 +927,7 @@ def check_netcat(self, port):
 
     def kill_netcat(self, port):
         self.run(
-            'pkill -f "^/bin/nc.openbsd -l -p {}"'.format(port),
+            'pkill -f "^/bin/nc.openbsd -6 -l -p {}"'.format(port),
             warn_only=True,  # It's fine if the process already dead
         )
 
@@ -956,7 +956,7 @@ def netcat_to_device(self, vol: virStorageVol) -> Iterator[Tuple[str, int]]:
 
         # Using DD lowers load on device with big enough Block Size
         self.run(
-            'nohup /bin/nc.openbsd -l -p {port} 2>>{log_file} '
+            'nohup /bin/nc.openbsd -6 -l -p {port} 2>>{log_file} '
             '| dd of={vol_path} obs=1048576 2>>{log_file} &'.format(
                 port=port,
                 log_file=self._log_filename('netcat', vol.name()),
@@ -983,7 +983,7 @@ def device_to_netcat(
         # Using DD lowers load on device with big enough Block Size
         self.run(
             'dd if={vol_path} ibs=1048576 | pv -f -s {size} '
-            '| /bin/nc.openbsd -q 1 {target_host} {target_port}'.format(
+            '| /bin/nc.openbsd -6 -q 1 {target_host} {target_port}'.format(
                 vol_path=vol.path(),
                 size=size,
                 target_host=listener[0],
@@ -1038,7 +1038,7 @@ def xfsrestore(
         #  -J: inhibits inventory update
         # xfsrestore needs to output its logs, otherwise it fails
         self.run(
-            'nohup /bin/nc.openbsd -l -p {port} 2>>{log_file} '
+            'nohup /bin/nc.openbsd -6 -l -p {port} 2>>{log_file} '
             '| ionice -c3 xfsrestore -F -J - {mount_dir} 2>>{log_file} 1>&2 &'
             .format(
                 port=port,
@@ -1080,7 +1080,7 @@ def xfsdump(self, vm: VM, listener, transaction: Transaction = None):
         #  -p: progress update interval
         self.run(
             'ionice -c3 xfsdump -o -l 0 -F -J -p 1 - {mount_dir} '
-            '| /bin/nc.openbsd -q 1 {target_host} {target_port}'
+            '| /bin/nc.openbsd -6 -q 1 {target_host} {target_port}'
             .format(
                 mount_dir=mount_dir,
                 target_host=listener[0],

igvm/settings.py

@@ -103,6 +103,7 @@
     ('bullseye', 'bookworm'): P2P_TLS_MIGRATION,
     ('bookworm', 'bookworm'): P2P_TLS_MIGRATION,
     ('bookworm', 'bullseye'): P2P_TLS_MIGRATION,
+    ('trixie', 'trixie'): P2P_TLS_MIGRATION,
 }
 
 # Arbitrarily chosen MAC address prefix with U/L bit set