Skip to content

Fix deprecated system-pools option #235

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

Open
wants to merge 3 commits into
base: devel
Choose a base branch
from
Open

Fix deprecated system-pools option #235

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9845282
Fix deprecated system-pools option
Oct 21, 2025
11bb6c8
resolving review comments
Oct 23, 2025
2c446a5
resolving review comments of Prajyot
Oct 28, 2025
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
15 changes: 8 additions & 7 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ Where <args>:

Environment Variables:
IBMCLOUD_API_KEY IBM Cloud API key
RELEASE_VER OpenShift release version (Default: 4.15)
RELEASE_VER OpenShift release version (Default: 4.20)
Copy link
Collaborator

@Prajyot-Parab Prajyot-Parab Oct 27, 2025

Choose a reason for hiding this comment

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

Add RHCOS_RELEASE_VER to this list with appropriate information.

Copy link
Author

@vijay-vin vijay-vin Oct 28, 2025

Choose a reason for hiding this comment

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

Updated the README file accordingly.

ARTIFACTS_VERSION Tag or Branch name of ocp4-upi-powervs repository (Default: main)
RHEL_SUBS_PASSWORD RHEL subscription password if not provided in variables
NO_OF_RETRY Number of retries/attempts to run repeatable actions such as create (Default: 5)
Expand Down Expand Up @@ -158,7 +158,7 @@ You'll need to place the file in the install directory and name it as **pull-sec

## Quickstart

1. Export the IBM Cloud API Key and RHEL Subscription Password.
1. Export the IBM Cloud API Key and RHEL Subscription Password. Export RHEL_SUBS_PASSWORD only if your bastion server is based on RHEL.
```
$ set +o history
$ export IBMCLOUD_API_KEY='<your API key>'
Expand Down Expand Up @@ -190,12 +190,13 @@ Before running the script, you may choose to override some environment variables

### Different OpenShift Versions

This [link](https://access.redhat.com/articles/6907891) shows the mapping of versions between OCP, RHCOS and RHEL. Note that the RHCOS versions are now aligned with RHEL version and not with OCP versions. For example, for OCP 4.20, RHCOS version is 9-6 and RHEL version is 9.6

By default OpenShift version 4.15 is installed.
By default OpenShift version 4.20 is installed.

If you want to install 4.14, then export the variable `RELEASE_VER`.
If you want to install 4.19, then export the variable `RELEASE_VER`.
```
$ export RELEASE_VER="4.14"
$ export RELEASE_VER="4.19"
```

### Non-interactive mode
Expand All @@ -214,8 +215,8 @@ You can avoid the interactive mode by having the required input files available
rhel_image_name = "rhel-83"
rhcos_image_name = "rhcos-415"
Copy link
Collaborator

@Prajyot-Parab Prajyot-Parab Oct 27, 2025

Choose a reason for hiding this comment

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

update this to 9-6 equivalent image to make it default with 4.20

Copy link
Author

@vijay-vin vijay-vin Oct 28, 2025

Choose a reason for hiding this comment

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

Updated the README file accordingly.

network_name = "ocp-net"
openshift_install_tarball = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/stable-4.15/openshift-install-linux.tar.gz"
openshift_client_tarball = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/stable-4.15/openshift-client-linux.tar.gz"
openshift_install_tarball = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/stable-4.20/openshift-install-linux.tar.gz"
openshift_client_tarball = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/stable-4.20/openshift-client-linux.tar.gz"
cluster_id_prefix = "test-ocp"
cluster_domain = "xip.io"
storage_type = "nfs"
Expand Down
10 changes: 6 additions & 4 deletions openshift-install-powervs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ Where <args>:

Environment Variables:
IBMCLOUD_API_KEY IBM Cloud API key
RELEASE_VER OpenShift release version (Default: 4.15)
RELEASE_VER OpenShift release version (Default: 4.20)
RHCOS_RELEASE_VER RHCOS Release version (Default: 9-6)
ARTIFACTS_VERSION Tag or Branch name of ocp4-upi-powervs repository (Default: main)
RHEL_SUBS_PASSWORD RHEL subscription password if not provided in variables
NO_OF_RETRY Number of retries/attempts to run repeatable actions such as create (Default: 5)
Expand All @@ -60,7 +61,8 @@ EOF
exit 0
}

RELEASE_VER=${RELEASE_VER:-"4.15"}
RELEASE_VER=${RELEASE_VER:-"4.20"}
RHCOS_RELEASE_VER=${RHCOS_RELEASE_VER:-"9-6"}
ARTIFACTS_REPO=${ARTIFACTS_REPO:-"https://github.com/ocp-power-automation/ocp4-upi-powervs"}
ARTIFACTS_VERSION=${ARTIFACTS_VERSION:-"main"}
#ARTIFACTS_VERSION=${ARTIFACTS_VERSION:-"release-$RELEASE_VER"}
Expand Down Expand Up @@ -1028,7 +1030,7 @@ function variables {
CATALOG_RHEL_IMAGES=$($CLI_PATH pi image lc --json | grep name | grep -iE 'rhel|centos' | cut -f4 -d\")
BOOT_IMAGES=$($CLI_PATH pi image ls --json | grep name | grep -vi rhcos | cut -f4 -d\")
RHEL_IMAGES="${CATALOG_RHEL_IMAGES}${IFS}${BOOT_IMAGES}"
RHCOS_IMAGES=$($CLI_PATH pi image ls --json | grep name | grep -vi rhel | grep -vi centos | grep -i "rhcos-${RELEASE_VER//.}-" | cut -f4 -d\")
RHCOS_IMAGES=$($CLI_PATH pi image ls --json | grep name | grep -vi rhel | grep -vi centos | grep -i "rhcos-${RHCOS_RELEASE_VER//.}-" | cut -f4 -d\")
[[ -z $RHCOS_IMAGES ]] && error "Cannot find RHCOS image for OCP $RELEASE_VER! Please use option '-all-images' if you have already imported the image"
fi

Expand All @@ -1049,7 +1051,7 @@ function variables {

[ -z "$ALL_OCP_VERSIONS" ] && error "No OCP versions found for version $RELEASE_VER... Ensure you have set correct RELEASE_VER"

ALL_SYSTEM_TYPES=$($CLI_PATH pi system-pools 2>/dev/null | grep "System Type" | awk '{print $3}' | sort | uniq)
ALL_SYSTEM_TYPES=$($CLI_PATH pi datacenter get ${ZONE} 2>/dev/null | grep "General" |cut -f2 -d\[ | cut -f1 -d\] | sort |sed 's/ /\n/g')
[ -z "$ALL_SYSTEM_TYPES" ] && error "Cannot find available System Types... please try again"

# TODO: Get region from a map of `zone:region` or any other good way
Expand Down
Loading