From 2f751c510d90b7334c60781fd2b24d73c9cf4ed9 Mon Sep 17 00:00:00 2001 From: Andrey Gubarev Date: Sun, 3 Mar 2024 15:38:51 +0400 Subject: [PATCH 1/3] reduced ssh wait timeout from 300 to 60 seconds in ansible setup --- .../{{cookiecutter.scenario_name}}/prepare.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/molecule_qemu/cookiecutter/{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/prepare.yml b/molecule_qemu/cookiecutter/{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/prepare.yml index 20a4dc5..ec96095 100644 --- a/molecule_qemu/cookiecutter/{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/prepare.yml +++ b/molecule_qemu/cookiecutter/{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/prepare.yml @@ -14,7 +14,7 @@ - name: Wait for SSH to become available ansible.builtin.wait_for_connection: delay: 5 - timeout: 300 + timeout: 60 - name: Gather facts ansible.builtin.setup: From 2fcd09b22067d2ade511b79769ce61ab8fffdddd Mon Sep 17 00:00:00 2001 From: Andrey Gubarev Date: Sun, 3 Mar 2024 15:39:00 +0400 Subject: [PATCH 2/3] changed default network ssh port from 22 to 2222 in create.yml --- molecule_qemu/playbooks/create.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/molecule_qemu/playbooks/create.yml b/molecule_qemu/playbooks/create.yml index a13d140..7e262e3 100644 --- a/molecule_qemu/playbooks/create.yml +++ b/molecule_qemu/playbooks/create.yml @@ -55,14 +55,14 @@ "network_mode": "{{ item.network_mode | default(qemu_network_mode) }}", "network_mac": "{{ '52:54:00' | community.general.random_mac() | regex_replace('(^|:)0([0-9A-Fa-f])', '\\1\\2') }}", - "network_ssh_port": "{{ item.network_ssh_port | default(22) }}", + "network_ssh_port": "{{ item.network_ssh_port | default(2222) }}", "network_ssh_user": "{{ item.network_ssh_user | default('ansible') }}", "vm_extra_args": "{{ item.vm_extra_args | default(qemu_extra_args) }}", "vm_cpus": "{{ item.vm_cpus | default(qemu_vm_cpus) }}", "vm_memory": "{{ item.vm_memory | default(qemu_vm_memory) }}", "vm_disk": "{{ item.vm_disk | default(qemu_vm_disk) }}", - + "disk_type": "{{ item.disk_type | default(qemu_disk_type) }}", "bios_type": "{{ item.bios_type | default(qemu_bios_type) }}", From bbbddb45fb32c1655e8b53f877a2654508c9a062 Mon Sep 17 00:00:00 2001 From: Andrey Gubarev Date: Sun, 3 Mar 2024 15:40:14 +0400 Subject: [PATCH 3/3] corrected default network_ssh_port value to 2222 --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 5d1847e..3f25f2e 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,6 @@ Supported network modes: - `user` - QEMU's user networking mode - `vmnet-shared` - QEMU's `vmnet-shared` networking mode (MacOS only) - Supported disk types: - `virtio` - QEMU's virtio disk type @@ -82,7 +81,7 @@ platforms: network_mode: vmnet-shared # optional, default is user network_extra_args: "" # optional, only used when network_mode: user - network_ssh_port: 2222 # optional, default is 22 + network_ssh_port: 2222 # optional, default is 2222 network_ssh_user: ansible # optional, default is ansible vm_cpus: 1 # optional, default is 1