AIAP: Prevent sushy from starting prereqs are met

The metal3-io sushy-tools container no longer includes the ping utility,
which was being used to test that the VMs were available. This changes
the container to use the shared drive to perform this check instead,
relieving the need for ping.

Change-Id: I0f697d1a7afac84f04fd27dc9b808857c9f64a7c
This commit is contained in:
Ian Howell 2021-08-19 12:56:41 -05:00
parent e24a53713e
commit 1dd84a5af9
3 changed files with 6 additions and 4 deletions

View File

@ -35,7 +35,7 @@ then
printf "Using cached airshipctl\n" printf "Using cached airshipctl\n"
cp -r "$CACHE_DIR/*" "$ARTIFACTS_DIR" cp -r "$CACHE_DIR/*" "$ARTIFACTS_DIR"
else else
printf "Waiting 30 seconds for the libvirt, sushy, and docker services to be ready\n" printf "Waiting 30 seconds for the libvirt and docker services to be ready\n"
sleep 30 sleep 30
cloneRepo $MANIFEST_REPO_NAME $MANIFEST_REPO_URL $MANIFEST_REPO_REF cloneRepo $MANIFEST_REPO_NAME $MANIFEST_REPO_URL $MANIFEST_REPO_REF

View File

@ -107,8 +107,8 @@ spec:
-config <(cat /csr_details.txt) \ -config <(cat /csr_details.txt) \
-extensions 'req_ext' -extensions 'req_ext'
# Wait for interface to come up # Wait for infrastructure to come up
while ! ping -c1 10.23.25.1 2>&1 >/dev/null; do sleep 1; done while [[ ! -e /tmp/completed/infra-builder ]]; do printf "Waiting on infra-builder...\n"; sleep 1; done
sushy-emulator \ sushy-emulator \
--debug \ --debug \
@ -121,6 +121,8 @@ spec:
volumeMounts: volumeMounts:
- name: var-run-libvirt - name: var-run-libvirt
mountPath: /var/run/libvirt mountPath: /var/run/libvirt
- name: completed
mountPath: /tmp/completed
- name: nginx - name: nginx
image: nginx:latest image: nginx:latest

View File

@ -14,7 +14,7 @@
set -ex set -ex
printf "Waiting 30 seconds for the libvirt, sushy, and docker services to be ready\n" printf "Waiting 30 seconds for the libvirt and docker services to be ready\n"
sleep 30 sleep 30
ansible-playbook -v /opt/ansible/playbooks/build-infra.yaml \ ansible-playbook -v /opt/ansible/playbooks/build-infra.yaml \