Skip to content

Commit f802951

Browse files
committed
WIP verify TLS for BMC
Signed-off-by: Dmitry Tantsur <[email protected]>
1 parent 3943338 commit f802951

File tree

2 files changed

+3
-15
lines changed

2 files changed

+3
-15
lines changed

ocp_install_env.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,8 @@ $(cluster_os_image)
395395
$(setVIPs apivips)
396396
$(setVIPs ingressvips)
397397
$(dnsvip)
398+
bmcVerifyCA: |
399+
$(cat "${WORKING_DIR}/virtualbmc/sushy-tools/cert.pem" | sed 's/^/ /')
398400
hosts:
399401
EOF
400402

@@ -455,8 +457,6 @@ function generate_ocp_host_manifest() {
455457

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

461461
secret="---
462462
apiVersion: v1
@@ -480,8 +480,7 @@ spec:
480480
bootMACAddress: $mac
481481
bmc:
482482
address: $address
483-
credentialsName: ${name}-bmc-secret
484-
disableCertificateVerification: ${disableCertificateVerification}"
483+
credentialsName: ${name}-bmc-secret"
485484

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

utils.sh

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -259,17 +259,6 @@ function node_map_to_install_config_hosts() {
259259
password: ${password}
260260
EOF
261261

262-
if [[ "$driver_prefix" == "redfish" ]]; then
263-
# Set disableCertificateVerification
264-
# Heads up, "verify ca" in ironic driver config, and "disableCertificateVerification" in BMH have opposite meaning
265-
verify_ca=$(node_val ${idx} "driver_info.redfish_verify_ca")
266-
disable_certificate_verification=$([ "$verify_ca" = "False" ] && echo "true" || echo "false")
267-
cat << EOF
268-
disableCertificateVerification: ${disable_certificate_verification}
269-
EOF
270-
fi
271-
272-
273262
if [ -n "${NETWORK_CONFIG_FOLDER:-}" ]; then
274263
node_network_config="${NETWORK_CONFIG_FOLDER}/${name}.yaml"
275264
if [ -e "$node_network_config" ]; then

0 commit comments

Comments
 (0)