From d538edeca41c89024ecfccb93838634b38e6d772 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Wed, 28 Feb 2024 10:39:11 +0100 Subject: [PATCH] copr-be: the wait-for-ssh script moved to resalloc-helpers --- roles/copr/backend/templates/provision/libvirt-new | 2 +- roles/copr/backend/templates/resalloc/osuosl-vm.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/copr/backend/templates/provision/libvirt-new b/roles/copr/backend/templates/provision/libvirt-new index cfd989f23a..3ff7ff6345 100755 --- a/roles/copr/backend/templates/provision/libvirt-new +++ b/roles/copr/backend/templates/provision/libvirt-new @@ -85,7 +85,7 @@ class LibvirtSpawner: Knowing the IP address of recently started VM, wait for the SSH server responding on that IP. """ - script = "resalloc-aws-wait-for-ssh" + script = "resalloc-wait-for-ssh" if self.call([script, '--timeout', '180', host, '--log', 'debug']): raise Exception("waiting not successful") diff --git a/roles/copr/backend/templates/resalloc/osuosl-vm.j2 b/roles/copr/backend/templates/resalloc/osuosl-vm.j2 index d73aaaa3a2..bacdffb3d2 100755 --- a/roles/copr/backend/templates/resalloc/osuosl-vm.j2 +++ b/roles/copr/backend/templates/resalloc/osuosl-vm.j2 @@ -16,7 +16,7 @@ resalloc-openstack-new \ --image "{{ copr_builder_images.osuosl.ppc64le }}" \ --flavor "$flavor" \ --name "$RESALLOC_NAME" \ - --post-command "set -x ; resalloc-aws-wait-for-ssh --timeout 250 --log debug \"\$RESALLOC_OS_IP\" >&2 && ansible-playbook $playbook -i \"\$RESALLOC_OS_IP,\" >&2 " \ + --post-command "set -x ; resalloc-wait-for-ssh --timeout 250 --log debug \"\$RESALLOC_OS_IP\" >&2 && ansible-playbook $playbook -i \"\$RESALLOC_OS_IP,\" >&2 " \ --key-pair-id copr-builder \ --nic net-id="$network" \ --print-ip