From 4c9adb4ddce1e5a0e5b74518977d8a29f8bf8e91 Mon Sep 17 00:00:00 2001
From: Sandwich <sandwich@archworks.co>
Date: Fri, 20 Mar 2026 16:52:15 +0100
Subject: [PATCH] fix(connection): set ansible_port explicitly at every
 connection transition

---
 main.yml                                       | 3 +++
 roles/environment/tasks/_configure_network.yml | 3 ++-
 roles/global_defaults/tasks/main.yml           | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/main.yml b/main.yml
index 0f8c836..2747f44 100644
--- a/main.yml
+++ b/main.yml
@@ -122,6 +122,9 @@
       vars:
         _primary: "{{ (system_cfg.users | dict2items | selectattr('value.password', 'defined') | first) }}"
       ansible.builtin.set_fact:
+        ansible_connection: ssh
+        ansible_host: "{{ system_cfg.network.ip }}"
+        ansible_port: 22
         ansible_user: "{{ _primary.key }}"
         ansible_password: "{{ _primary.value.password }}"
         ansible_become_password: "{{ _primary.value.password }}"
diff --git a/roles/environment/tasks/_configure_network.yml b/roles/environment/tasks/_configure_network.yml
index 37fce51..6a09a82 100644
--- a/roles/environment/tasks/_configure_network.yml
+++ b/roles/environment/tasks/_configure_network.yml
@@ -87,9 +87,10 @@
     - name: Switch to SSH connection
       ansible.builtin.set_fact:
         ansible_connection: ssh
+        ansible_host: "{{ system_cfg.network.ip }}"
+        ansible_port: 22
         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
diff --git a/roles/global_defaults/tasks/main.yml b/roles/global_defaults/tasks/main.yml
index b5f4046..e94a517 100644
--- a/roles/global_defaults/tasks/main.yml
+++ b/roles/global_defaults/tasks/main.yml
@@ -84,6 +84,8 @@
   vars:
     _primary: "{{ (system_cfg.users | dict2items | selectattr('value.password', 'defined') | first) }}"
   ansible.builtin.set_fact:
+    ansible_host: "{{ system_cfg.network.ip }}"
+    ansible_port: 22
     ansible_user: "{{ _primary.key }}"
     ansible_password: "{{ _primary.value.password }}"
     ansible_become_password: "{{ _primary.value.password }}"