From f00f40f0bde2679dc07353b0fbec2daa15840387 Mon Sep 17 00:00:00 2001 From: Ian Howell Date: Mon, 20 Sep 2021 12:10:52 -0500 Subject: [PATCH] AIAP: Update host file location The location of the host config file was moved in e2c56108eef38dd83df52fcfd1fa6844e5376a56, which resulted in breakages in AIAP. This updates the file's location in the runner container to circumvent the breakages. Change-Id: I3c4b9c92cabcf7549e75da1c77b1775b4cdbc6bb --- tools/airship-in-a-pod/runner/assets/entrypoint.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/airship-in-a-pod/runner/assets/entrypoint.sh b/tools/airship-in-a-pod/runner/assets/entrypoint.sh index 198ec65b8..df2761d36 100755 --- a/tools/airship-in-a-pod/runner/assets/entrypoint.sh +++ b/tools/airship-in-a-pod/runner/assets/entrypoint.sh @@ -65,10 +65,11 @@ fi echo "export KUBECONFIG=$HOME/.airship/kubeconfig" >> ~/.bashrc repo_name=$(yq -r .manifests.dummy_manifest.repositories.primary.url /root/.airship/config | awk 'BEGIN {FS="/"} {print $NF}' | cut -d'.' -f1) -sed -i -e 's#bmcAddress: redfish+http://\([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+\):8000#bmcAddress: redfish+https://10.23.25.1:8443#' "$AIRSHIP_CONFIG_MANIFEST_DIRECTORY/$repo_name/manifests/site/test-site/target/catalogues/hosts.yaml" -sed -i -e 's#root#username#' "$AIRSHIP_CONFIG_MANIFEST_DIRECTORY/$repo_name/manifests/site/test-site/target/catalogues/hosts.yaml" -sed -i -e 's#r00tme#password#' "$AIRSHIP_CONFIG_MANIFEST_DIRECTORY/$repo_name/manifests/site/test-site/target/catalogues/hosts.yaml" -sed -i -e 's#disableCertificateVerification: false#disableCertificateVerification: true#' "$AIRSHIP_CONFIG_MANIFEST_DIRECTORY/$repo_name/manifests/site/test-site/target/catalogues/hosts.yaml" +hosts_file="$AIRSHIP_CONFIG_MANIFEST_DIRECTORY/$repo_name/manifests/site/test-site/target/catalogues/shareable/hosts.yaml" +sed -i -e 's#bmcAddress: redfish+http://\([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+\):8000#bmcAddress: redfish+https://10.23.25.1:8443#' "$hosts_file" +sed -i -e 's#root#username#' "$hosts_file" +sed -i -e 's#r00tme#password#' "$hosts_file" +sed -i -e 's#disableCertificateVerification: false#disableCertificateVerification: true#' "$hosts_file" if [[ "$USE_CACHED_ISO" = "true" ]]; then mkdir -p /srv/images