From e2514700598692d213ff9e122ee660182015b0e0 Mon Sep 17 00:00:00 2001 From: Thiago Brito Date: Mon, 15 Aug 2022 15:01:12 -0300 Subject: [PATCH] Fix running remote play on random ssh port This fixes the ability to run the backup play (or any play for that matter) remotely when ansible_port is configured on /etc/ansible/hosts TEST PLAN PASS Remote play of the backup playbook PASS Local play of the backup playbook PASS Remote play of the restore playbook PASS Local play of the restore playbook Closes-Bug: #1986554 Signed-off-by: Thiago Brito Change-Id: I48227d2e00b16aaa595aec6d628ce36ea1c8ba51 --- .../playbooks/roles/common/prepare-env/tasks/main.yml | 11 +---------- .../restore-platform/restore-more-data/tasks/main.yml | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/playbookconfig/src/playbooks/roles/common/prepare-env/tasks/main.yml b/playbookconfig/src/playbooks/roles/common/prepare-env/tasks/main.yml index e9e4da4da..6bef49cb9 100644 --- a/playbookconfig/src/playbooks/roles/common/prepare-env/tasks/main.yml +++ b/playbookconfig/src/playbooks/roles/common/prepare-env/tasks/main.yml @@ -38,15 +38,6 @@ ansible_host: "{{ ansible_host | ipaddr }}" when: ansible_host | ipaddr - - name: Set SSH hostname - set_fact: - ssh_hostname: "{{ ansible_host }}" - - - name: Set SSH hostname if SSH port is not default - set_fact: - ssh_hostname: "[{{ ansible_host }}]:{{ ansible_port }}" - when: ansible_port != '22' - - name: Check connectivity local_action: command ping -c 1 {{ ansible_host }} failed_when: false @@ -59,7 +50,7 @@ when: ping_result.rc != 0 and item is search('100% packet loss') - name: Gather remote SSH public key - command: ssh-keyscan -T 20 -t ecdsa {{ ssh_hostname }} + command: "ssh-keyscan -T 20 -t ecdsa -p {{ ansible_port if ansible_port else 22 }} {{ ansible_host }}" register: remote_keyscan until: remote_keyscan.stdout != "" retries: 6 diff --git a/playbookconfig/src/playbooks/roles/restore-platform/restore-more-data/tasks/main.yml b/playbookconfig/src/playbooks/roles/restore-platform/restore-more-data/tasks/main.yml index aa673ec20..8db8e6164 100644 --- a/playbookconfig/src/playbooks/roles/restore-platform/restore-more-data/tasks/main.yml +++ b/playbookconfig/src/playbooks/roles/restore-platform/restore-more-data/tasks/main.yml @@ -162,7 +162,7 @@ - block: - name: Gather latest SSH public key - command: ssh-keyscan -T 20 -t ecdsa {{ ssh_hostname }} + command: ssh-keyscan -T 20 -t ecdsa -p {{ ansible_port if ansible_port else 22 }} {{ ansible_host }} register: remote_keyscan until: remote_keyscan.stdout != "" retries: 6