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
changes/61/805261/1
Ian Howell 1 year ago
parent e24a53713e
commit 1dd84a5af9
  1. 2
      tools/airship-in-a-pod/artifact-setup/assets/entrypoint.sh
  2. 6
      tools/airship-in-a-pod/examples/base/airship-in-a-pod.yaml
  3. 2
      tools/airship-in-a-pod/infra-builder/assets/entrypoint.sh

@ -35,7 +35,7 @@ then
printf "Using cached airshipctl\n"
cp -r "$CACHE_DIR/*" "$ARTIFACTS_DIR"
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
cloneRepo $MANIFEST_REPO_NAME $MANIFEST_REPO_URL $MANIFEST_REPO_REF

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

@ -14,7 +14,7 @@
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
ansible-playbook -v /opt/ansible/playbooks/build-infra.yaml \

Loading…
Cancel
Save