Change the FRR Vagrant box to Debian bookworm

Fixes #1595

Also: includes a YAML validation fix for an unrelated file

netsim/ansible/tasks/readiness-check/vsrx.yml

@@ -7,6 +7,7 @@
 - name: Execute local ssh command to check vSRX readiness
   local_action:
     module: command
+    # yamllint disable-line rule:line-length
     cmd: "sshpass -p '{{ ansible_ssh_pass }}' ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null {{ ansible_user }}@{{ ansible_host }} 'show system information'"
   register: command_out
   until: command_out.rc == 0

netsim/ansible/templates/initial/frr.j2

@@ -30,6 +30,13 @@ sysctl -w net.ipv6.conf.all.forwarding=1
 #
 # Install FRR on a Ubuntu VM if needed
 #
+if which /usr/bin/gpg; then
+  echo "gnupg already installed, assuming we also have curl"
+else
+  echo "Installing gnupg and curl"
+  apt-get update -qq
+  apt-get install -qq gnupg curl
+fi
 if which /usr/lib/frr/frrinit.sh; then
   echo "FRR already installed, skipping installation"
 else

netsim/devices/frr.yml

@@ -27,18 +27,19 @@ clab:
       daemons: /etc/frr/daemons
       hosts: /etc/hosts
 libvirt:
-  image: generic/ubuntu2004
+  image: debian/bookworm64 #generic/ubuntu2004
   group_vars:
     ansible_connection: paramiko
     ansible_user: vagrant
     ansible_ssh_pass: vagrant
     netlab_show_command: [ sudo, vtysh, -c, 'show $@' ]
 virtualbox:
-  image: generic/ubuntu2004
+  image: debian/bookworm64 #generic/ubuntu2004
   group_vars:
     ansible_connection: paramiko
     ansible_user: vagrant
     ansible_ssh_pass: vagrant
+    netlab_show_command: [ sudo, vtysh, -c, 'show $@' ]
 external:
   image: none
 features:

netsim/templates/provider/libvirt/frr-domain.j2

@@ -1,6 +1,16 @@
+    $frr_script = <<-SCRIPT
+echo vagrant:{{ n.ansible_ssh_pass }} | chpasswd
+sed -i -e "s#PasswordAuthentication no#PasswordAuthentication yes#" /etc/ssh/sshd_config
+service sshd restart
+    SCRIPT
+
     {{ name }}.vm.synced_folder ".", "/vagrant", id: "vagrant-root", disabled: true
 
     {{ name }}.vm.provider :libvirt do |domain|
       domain.cpus = 1
       domain.memory = 1024
     end
+
+    # Run debian-specific provisioning script
+    #
+    {{ name }}.vm.provision :shell , :inline => $frr_script

netsim/templates/provider/virtualbox/frr-domain.j2

@@ -1,5 +1,16 @@
+    $frr_script = <<-SCRIPT
+echo vagrant:{{ n.ansible_ssh_pass }} | chpasswd
+sed -i -e "s#PasswordAuthentication no#PasswordAuthentication yes#" /etc/ssh/sshd_config
+service sshd restart
+    SCRIPT
+
     {{ name }}.vm.synced_folder ".", "/vagrant", id: "vagrant-root", disabled: true
+
     {{ name }}.vm.provider :virtualbox do |domain|
       domain.cpus = 1
       domain.memory = 1024
     end
+
+    # Run debian-specific provisioning script
+    #
+    {{ name }}.vm.provision :shell , :inline => $frr_script