From 868cdea9b27806f55989754f3fee544dd2ee0fce Mon Sep 17 00:00:00 2001
From: Sandwich <sandwich@archworks.co>
Date: Thu, 12 Mar 2026 06:27:52 +0100
Subject: [PATCH] fix(environment): move SSH switchover into
 _configure_network.yml before prepare_installer

---
 main.yml                                      | 22 -------------------
 .../environment/tasks/_configure_network.yml  | 16 ++++++++++++++
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/main.yml b/main.yml
index 5ea1357..6fce4e0 100644
--- a/main.yml
+++ b/main.yml
@@ -129,28 +129,6 @@
           ansible.builtin.include_role:
             name: environment
 
-        - name: Switch to SSH connection for VMware
-          when:
-            - hypervisor_type == "vmware"
-            - hypervisor_cfg.ssh | default(false) | bool
-            - system_cfg.network.ip | default('') | string | length > 0
-          block:
-            - name: Set SSH connection variables
-              ansible.builtin.set_fact:
-                ansible_connection: ssh
-                ansible_user: root
-                ansible_password: ""
-                ansible_host: "{{ system_cfg.network.ip }}"
-                ansible_ssh_extra_args: "-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
-
-            - name: Reset VMware Tools connection
-              ansible.builtin.meta: reset_connection
-
-            - name: Verify SSH connectivity
-              ansible.builtin.wait_for_connection:
-                timeout: 30
-                delay: 2
-
         - name: Partition disks
           ansible.builtin.include_role:
             name: partitioning
diff --git a/roles/environment/tasks/_configure_network.yml b/roles/environment/tasks/_configure_network.yml
index d42781e..37fce51 100644
--- a/roles/environment/tasks/_configure_network.yml
+++ b/roles/environment/tasks/_configure_network.yml
@@ -83,3 +83,19 @@
       ansible.builtin.service:
         name: sshd
         state: reloaded
+
+    - name: Switch to SSH connection
+      ansible.builtin.set_fact:
+        ansible_connection: ssh
+        ansible_user: root
+        ansible_password: ""
+        ansible_host: "{{ system_cfg.network.ip }}"
+        ansible_ssh_extra_args: "-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
+
+    - name: Reset connection for SSH switchover
+      ansible.builtin.meta: reset_connection
+
+    - name: Verify SSH connectivity
+      ansible.builtin.wait_for_connection:
+        timeout: 30
+        delay: 2