diff --git a/02_configure_host.sh b/02_configure_host.sh index f1206dae4..65bb353d3 100755 --- a/02_configure_host.sh +++ b/02_configure_host.sh @@ -335,3 +335,9 @@ if [[ ! -z "${BOND_PRIMARY_INTERFACE:-}" ]]; then setup_bond master $NUM_MASTERS setup_bond worker $NUM_WORKERS fi + +# We should have both virsh networks started by this point. +# Let's do a quick validation here before moving to the next +# stage +sudo virsh net-list | grep ${PROVISIONING_NETWORK_NAME} || sudo virsh net-start ${PROVISIONING_NETWORK_NAME} +sudo virsh net-list | grep ${BAREMETAL_NETWORK_NAME} || sudo virsh net-start ${BAREMETAL_NETWORK_NAME} diff --git a/03_build_installer.sh b/03_build_installer.sh index e29991a08..1355dbbc4 100755 --- a/03_build_installer.sh +++ b/03_build_installer.sh @@ -61,4 +61,5 @@ else # Clone and build the installer from source clone_installer build_installer -fi \ No newline at end of file +fi + diff --git a/config_example.sh b/config_example.sh index 0c9bfb05b..f13f116e6 100755 --- a/config_example.sh +++ b/config_example.sh @@ -40,11 +40,20 @@ set -x # Select a different release type from which to pull the latest image. # If using ga then set OPENSHIFT_VERSION to the required version. # Default: nightly -# Choices: ci, nightly, ga +# Choices: ci, nightly, ga, okd # NOTE: Do not use for arm64, instead override OPENSHIFT_RELEASE_IMAGE +# NOTE: If set to okd, a OPENSHIFT_RELEASE_IMAGE is required. See the below +# section on OPENSHIFT_RELEASE_IMAGE for an example. # #export OPENSHIFT_RELEASE_TYPE=nightly +# OPENSHIFT_RELEASE_IMAGE - +# Define a specific image to deploy the cluster from. If using OKD, +# this can be set to an image from: https://amd64.origin.releases.ci.openshift.org +# For example: +# export OPENSHIFT_RELEASE_IMAGE=registry.ci.openshift.org/origin/release:4.15.0-0.okd-2023-08-29-101209 +# Default: Undefined + # OPENSHIFT_VERSION - # Set the Openshift version. If unset defaults to $OPENSHIFT_RELEASE_STREAM. # NOTE: Do not use for arm64, instead override OPENSHIFT_RELEASE_IMAGE diff --git a/utils.sh b/utils.sh index 3d9acca38..e27b84467 100755 --- a/utils.sh +++ b/utils.sh @@ -735,6 +735,9 @@ function verify_pull_secret() { } function write_pull_secret() { + if [ "${OPENSHIFT_RELEASE_TYPE}" == "okd" ]; then + return + fi if [ "${OPENSHIFT_CI}" == true ]; then # We don't need to fetch a personal pull secret with the # token, but we still need to merge what we're given with the diff --git a/validation.sh b/validation.sh index 8a98ab748..b776961c3 100644 --- a/validation.sh +++ b/validation.sh @@ -55,7 +55,7 @@ function early_deploy_validation() { early_either_validation - if [ ! -s ${PERSONAL_PULL_SECRET} ]; then + if [ ! -s ${PERSONAL_PULL_SECRET} -a ${OPENSHIFT_RELEASE_TYPE} != "okd" ]; then error "${PERSONAL_PULL_SECRET} is missing or empty" if [ -n "${PULL_SECRET:-}" ]; then error "It looks like you are using the old PULL_SECRET variable." @@ -67,7 +67,7 @@ function early_deploy_validation() { exit 1 fi - if [ "${OPENSHIFT_CI}" != "true" -a ${#CI_TOKEN} = 0 ]; then + if [ "${OPENSHIFT_CI}" != "true" -a ${#CI_TOKEN} = 0 -a "${OPENSHIFT_RELEASE_TYPE}" != "okd" ]; then error "No valid CI_TOKEN set in ${CONFIG}" if [ -n "${PULL_SECRET:-}" ]; then error "It looks like you are using the old PULL_SECRET variable."