@@ -59,7 +59,7 @@ launch_baremetal_operator()
5959 pushd " ${BMOPATH} "
6060
6161 # Deploy BMO using deploy.sh script
62- if [[ " ${EPHEMERAL_CLUSTER } " != " tilt" ]]; then
62+ if [[ " ${BOOTSTRAP_CLUSTER } " != " tilt" ]]; then
6363 # Update container images to use local ones
6464 if [[ -n " ${BARE_METAL_OPERATOR_LOCAL_IMAGE:- } " ]]; then
6565 update_component_image BMO " ${BARE_METAL_OPERATOR_LOCAL_IMAGE} "
236236 update_component_image IPA-downloader " ${IPA_DOWNLOADER_IMAGE} "
237237 fi
238238
239- if [[ " ${EPHEMERAL_CLUSTER } " != " minikube" ]]; then
239+ if [[ " ${BOOTSTRAP_CLUSTER } " != " minikube" ]]; then
240240 update_images
241241 ${RUN_LOCAL_IRONIC_SCRIPT}
242242 # Wait for ironic to become ready
@@ -352,7 +352,7 @@ launch_fake_ipa()
352352{
353353 # Create a folder to host fakeIPA config and certs
354354 mkdir -p " ${WORKING_DIR} /fake-ipa"
355- if [[ " ${EPHEMERAL_CLUSTER } " = " kind" ]] && [[ " ${IRONIC_TLS_SETUP} " = " true" ]]; then
355+ if [[ " ${BOOTSTRAP_CLUSTER } " = " kind" ]] && [[ " ${IRONIC_TLS_SETUP} " = " true" ]]; then
356356 cp " ${IRONIC_CACERT_FILE} " " ${WORKING_DIR} /fake-ipa/ironic-ca.crt"
357357 elif [[ " ${IRONIC_TLS_SETUP} " = " true" ]]; then
358358 # wait for ironic to be running to ensure ironic-cert is created
@@ -716,9 +716,9 @@ start_management_cluster()
716716{
717717 local minikube_error
718718
719- if [[ " ${EPHEMERAL_CLUSTER } " = " kind" ]]; then
719+ if [[ " ${BOOTSTRAP_CLUSTER } " = " kind" ]]; then
720720 launch_kind
721- elif [[ " ${EPHEMERAL_CLUSTER } " = " minikube" ]]; then
721+ elif [[ " ${BOOTSTRAP_CLUSTER } " = " minikube" ]]; then
722722 # This method, defined in lib/common.sh, will either ensure sockets are up'n'running
723723 # for CS9 and RHEL9, or restart the libvirtd.service for other DISTRO
724724 manage_libvirtd
@@ -810,7 +810,7 @@ build_ipxe_firmware()
810810" ${BMOPATH} " /tools/remove_local_ironic.sh
811811create_clouds_yaml
812812
813- if [[ " ${EPHEMERAL_CLUSTER } " = " tilt" ]]; then
813+ if [[ " ${BOOTSTRAP_CLUSTER } " = " tilt" ]]; then
814814 # shellcheck disable=SC1091
815815 . tilt-setup/deploy_tilt_env.sh
816816 exit 0
0 commit comments