Skip to content

OCPEDGE-1825: [TNF] Reworked TNF logic to render fencing block conditionally. #1751

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 13, 2025
Merged

OCPEDGE-1825: [TNF] Reworked TNF logic to render fencing block conditionally. #1751

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,13 +304,20 @@ EOF
}

function node_map_to_install_config_fencing_credentials() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Side note: this should be moved outside of utils.sh to some more specific file.

TNF_ENABLED_RELEASE=4.19

# If we didn't support TNF in this release, we skip rendering the fencing block
if is_lower_version "$(openshift_version "${OCP_DIR}")" "$TNF_ENABLED_RELEASE"; then
return 0
fi

if [[ -z "${ENABLE_ARBITER:-}" ]] && [[ "${NUM_MASTERS}" -eq 2 ]]; then
cat <<EOF
fencing:
credentials:
EOF
for ((idx=0;idx<$(($NUM_MASTERS));idx++)); do
name=$(node_val ${idx} "name")
name="$(printf $MASTER_HOSTNAME_FORMAT ${idx})"
username=$(node_val ${idx} "driver_info.username")
password=$(node_val ${idx} "driver_info.password")
address=$(node_val ${idx} "driver_info.address")
Expand All @@ -320,7 +327,15 @@ EOF
address: ${address}
username: ${username}
password: ${password}
sslInsecure: true
EOF
# We don't support overriding certificateVerification in 4.19
if [ $(openshift_version "${OCP_DIR}") == "$TNF_ENABLED_RELEASE" ]; then
continue
fi
declare -l redfish_verify_ca=$(node_val ${idx} "driver_info.redfish_verify_ca")
certificate_verification=$(["${redfish_verify_ca}" == "true" ] && echo -n "Enabled" || echo -n "Disabled")
cat <<EOF
certificateVerification: ${certificate_verification}
EOF
done
fi
Expand Down