Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 3 additions & 4 deletions ocp_install_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,8 @@ $(cluster_os_image)
$(setVIPs apivips)
$(setVIPs ingressvips)
$(dnsvip)
bmcVerifyCA: |
$(sudo sed 's/^/ /' "${WORKING_DIR}/virtualbmc/sushy-tools/cert.pem")
hosts:
EOF

Expand Down Expand Up @@ -455,8 +457,6 @@ function generate_ocp_host_manifest() {

encoded_username=$(echo -n "$username" | base64)
encoded_password=$(echo -n "$password" | base64)
# Heads up, "verify_ca" in ironic driver config, and "disableCertificateVerification" in BMH have opposite meaning
disableCertificateVerification=$([ "$verify_ca" = "False" ] && echo "true" || echo "false")

secret="---
apiVersion: v1
Expand All @@ -480,8 +480,7 @@ spec:
bootMACAddress: $mac
bmc:
address: $address
credentialsName: ${name}-bmc-secret
disableCertificateVerification: ${disableCertificateVerification}"
credentialsName: ${name}-bmc-secret"

echo "${secret}${bmh}" >> "${outdir}/${host_output}"

Expand Down
11 changes: 0 additions & 11 deletions utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -259,17 +259,6 @@ function node_map_to_install_config_hosts() {
password: ${password}
EOF

if [[ "$driver_prefix" == "redfish" ]]; then
# Set disableCertificateVerification
# Heads up, "verify ca" in ironic driver config, and "disableCertificateVerification" in BMH have opposite meaning
verify_ca=$(node_val ${idx} "driver_info.redfish_verify_ca")
disable_certificate_verification=$([ "$verify_ca" = "False" ] && echo "true" || echo "false")
cat << EOF
disableCertificateVerification: ${disable_certificate_verification}
EOF
fi


if [ -n "${NETWORK_CONFIG_FOLDER:-}" ]; then
node_network_config="${NETWORK_CONFIG_FOLDER}/${name}.yaml"
if [ -e "$node_network_config" ]; then
Expand Down