Skip to content

OCPBUGS-19676: Allow agent VSphere installs by simulating VMWare host #1588

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
openshift-ci merged 1 commit into from
Nov 2, 2023
Merged

OCPBUGS-19676: Allow agent VSphere installs by simulating VMWare host #1588

Show file tree
Hide file tree
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
27 changes: 21 additions & 6 deletions agent/05_agent_configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,8 +374,10 @@ EOF
fi
}

# Change the domain manufacturer and product to ensure validations pass when using external platform
function set_oci() {
# Change the domain manufacturer to ensure validations pass when using specific platforms
function set_device_mfg() {

platform=${3}

tmpdomain=$(mktemp --tmpdir "virt-domain--XXXXXXXXXX")
_tmpfiles="$_tmpfiles $tmpdomain"
Expand All @@ -384,13 +386,26 @@ function set_oci() {
do
name=${CLUSTER_NAME}_${1}_${n}
sudo virsh dumpxml ${name} > ${tmpdomain}
sed -i '/\/os>/a\

if [[ "${platform}" == "external" ]]; then
sed -i '/\/os>/a\
<sysinfo type="smbios">\
<system>\
<entry name="manufacturer">OracleCloud.com</entry>\
<entry name="product">OCI</entry>\
</system>\
</sysinfo>' ${tmpdomain}
elif [[ "${platform}" == "vsphere" ]]; then
sed -i '/\/os>/a\
<sysinfo type="smbios">\
<system>\
<entry name="manufacturer">VMware, Inc.</entry>\
</system>\
</sysinfo>' ${tmpdomain}
else
echo "Invalid platform ${platform} for manufacturer override"
exit 1
fi

sed -i '/\<os>/a\
<smbios mode="sysinfo"/>' ${tmpdomain}
Expand Down Expand Up @@ -435,9 +450,9 @@ else
configure_dnsmasq ${ip} ""
fi

if [[ "${AGENT_PLATFORM_TYPE}" == "external" ]]; then
set_oci master $NUM_MASTERS
set_oci worker $NUM_WORKERS
if [[ "${AGENT_PLATFORM_TYPE}" == "external" ]] || [[ "${AGENT_PLATFORM_TYPE}" == "vsphere" ]]; then
set_device_mfg master $NUM_MASTERS ${AGENT_PLATFORM_TYPE}
set_device_mfg worker $NUM_WORKERS ${AGENT_PLATFORM_TYPE}
fi

generate_cluster_manifests
Expand Down
14 changes: 14 additions & 0 deletions agent/roles/manifests/templates/install-config_yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,20 @@ platform:
{% elif (platform_type == "external") %}
external:
platformName: oci
{% elif (platform_type == "vsphere") %}
vsphere:
{% set macs = agent_nodes_macs.split(',') %}
{% set hostnames = agent_nodes_hostnames.split(',') %}
apiVIPs:
{% set a_vips = api_vips.split(',') %}
{% for api_vip in a_vips %}
- {{ api_vip }}
{% endfor %}
ingressVIPs:
{% set i_vips = ingress_vips.split(',') %}
{% for ingress_vip in i_vips %}
- {{ ingress_vip }}
{% endfor %}
{% endif %}
pullSecret: {{ pull_secret_contents }}
sshKey: {{ ssh_pub_key }}
Expand Down