diff --git a/scripts/ironic-common.sh b/scripts/ironic-common.sh index 388d1ea17..07a53057a 100644 --- a/scripts/ironic-common.sh +++ b/scripts/ironic-common.sh @@ -103,7 +103,7 @@ export IRONIC_INSPECTOR_ACCESS_PORT=${IRONIC_INSPECTOR_ACCESS_PORT:-5050} export IRONIC_INSPECTOR_LISTEN_PORT=${IRONIC_INSPECTOR_LISTEN_PORT:-$IRONIC_INSPECTOR_ACCESS_PORT} # If this is false, built-in inspection is used. -export USE_IRONIC_INSPECTOR=${USE_IRONIC_INSPECTOR:-true} +export USE_IRONIC_INSPECTOR=${USE_IRONIC_INSPECTOR:-false} export IRONIC_INSPECTOR_ENABLE_DISCOVERY=${IRONIC_INSPECTOR_ENABLE_DISCOVERY:-false} if [[ "${USE_IRONIC_INSPECTOR}" != "true" ]] && [[ "${IRONIC_INSPECTOR_ENABLE_DISCOVERY}" == "true" ]]; then echo "Discovery is only supported with ironic-inspector at this point" diff --git a/scripts/runhttpd b/scripts/runhttpd index 87a2e6056..456693da0 100755 --- a/scripts/runhttpd +++ b/scripts/runhttpd @@ -33,11 +33,7 @@ chmod 0777 /shared/html IRONIC_BASE_URL="${IRONIC_SCHEME}://${IRONIC_URL_HOST}" -if [[ "${USE_IRONIC_INSPECTOR}" == "true" ]]; then - INSPECTOR_EXTRA_ARGS=" ipa-inspection-callback-url=${IRONIC_BASE_URL}:${IRONIC_INSPECTOR_ACCESS_PORT}/v1/continue" -else - INSPECTOR_EXTRA_ARGS=" ipa-inspection-callback-url=${IRONIC_BASE_URL}:${IRONIC_ACCESS_PORT}/v1/continue_inspection" -fi +INSPECTOR_EXTRA_ARGS=" ipa-inspection-callback-url=${IRONIC_BASE_URL}:${IRONIC_INSPECTOR_ACCESS_PORT}/v1/continue" if [[ "$IRONIC_FAST_TRACK" == "true" ]]; then INSPECTOR_EXTRA_ARGS+=" ipa-api-url=${IRONIC_BASE_URL}:${IRONIC_ACCESS_PORT}"