Skip to content

Commit

Permalink
Only specify dnsVIP for < 4.5
Browse files Browse the repository at this point in the history
This was removed in openshift/installer#3304
  • Loading branch information
Steven Hardy committed Nov 19, 2020
1 parent 5895e45 commit b4a3cf9
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion ocp_install_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,18 @@ EOF
fi
}

function dnsvip() {
local version

# dnsVIP was removed from 4.5
version=$(openshift_version | sed "s/\.//")
if [[ $version < 45 ]]; then
cat <<EOF
dnsVIP: ${DNS_VIP}
EOF
fi
}

function libvirturi() {
if [[ "$REMOTE_LIBVIRT" -ne 0 ]]; then
cat <<EOF
Expand Down Expand Up @@ -211,7 +223,7 @@ $(baremetal_network_configuration)
clusterOSImage: http://$(wrap_if_ipv6 $MIRROR_IP)/images/${MACHINE_OS_IMAGE_NAME}?sha256=${MACHINE_OS_IMAGE_SHA256}
apiVIP: ${API_VIP}
ingressVIP: ${INGRESS_VIP}
dnsVIP: ${DNS_VIP}
$(dnsvip)
hosts:
$(node_map_to_install_config_hosts $NUM_MASTERS 0 master)
$(node_map_to_install_config_hosts $NUM_WORKERS $NUM_MASTERS worker)
Expand Down

0 comments on commit b4a3cf9

Please sign in to comment.