Skip to content

Commit

Permalink
Use the existing 'SSH-in-VM-in-container' check for OS10. (#1338)
Browse files Browse the repository at this point in the history
Also:
* Check if 'sshpass' is installed
* Fixes #1334
  • Loading branch information
ipspace authored Oct 4, 2024
1 parent aa92895 commit 1f59a60
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
6 changes: 6 additions & 0 deletions netsim/ansible/tasks/readiness-check/dellos10-clab.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- name: Wait a minute for OS10 to start waking up
pause:
minutes: 1

- name: Wait for SSH server on OS10 to become ready
include_tasks: vm-clab-ssh-check.yml
15 changes: 0 additions & 15 deletions netsim/ansible/tasks/readiness-check/dellos10.yml

This file was deleted.

7 changes: 7 additions & 0 deletions netsim/ansible/tasks/readiness-check/vm-clab-ssh-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
# Use this task list to figure out when a VM in a container is started
#
---
- name: Check if 'sshpass' is installed
local_action:
module: shell
cmd: which sshpass
run_once: True
any_errors_fatal: True

- name: Execute local ssh command to check {{ netlab_device_type|default(inventory_hostname) }} readiness
local_action:
module: shell
Expand Down
2 changes: 2 additions & 0 deletions netsim/devices/dellos10.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ clab:
group_vars:
ansible_user: admin
ansible_ssh_pass: admin
netlab_check_retries: 40
netlab_check_delay: 10
libvirt:
image: dell/os10
build: https://netlab.tools/labs/dellos10/
Expand Down

0 comments on commit 1f59a60

Please sign in to comment.