Skip to content

Commit

Permalink
Merge pull request #199 from yussufsh/devel
Browse files Browse the repository at this point in the history
Use the OCP 4.11 version as default
  • Loading branch information
Power Cloud Robot authored Aug 12, 2022
2 parents eed6129 + 49970e0 commit c4142b8
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ Where <args>:
Environment Variables:
IBMCLOUD_API_KEY IBM Cloud API key
RELEASE_VER OpenShift release version (Default: 4.10)
RELEASE_VER OpenShift release version (Default: 4.11)
ARTIFACTS_VERSION Tag or Branch name of ocp4-upi-powervs repository (Default: release-<RELEASE_VER>)
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 @@ -189,17 +189,17 @@ Before running the script, you may choose to override some environment variables
### Different OpenShift Versions
By default OpenShift version 4.10 is installed.
By default OpenShift version 4.11 is installed.
If you want to install 4.9, then export the variable `RELEASE_VER`: Default is 4.10
If you want to install 4.10, then export the variable `RELEASE_VER`: Default is 4.11
```
$ export RELEASE_VER="4.9"
$ export RELEASE_VER="4.10"
```
`ARTIFACTS_VERSION`: Tag/Branch (eg: release-4.9, v4.9, master) of [ocp4-upi-powervs](https://github.com/ocp-power-automation/ocp4-upi-powervs) repository. Default is "release-<RELEASE_VER>".
`ARTIFACTS_VERSION`: Tag/Branch (eg: release-4.11, v4.11, master) of [ocp4-upi-powervs](https://github.com/ocp-power-automation/ocp4-upi-powervs) repository. Default is "release-<RELEASE_VER>".
```
$ export ARTIFACTS_VERSION="release-4.10"
$ export ARTIFACTS_VERSION="release-4.11"
```
### Non-interactive mode
Expand All @@ -215,11 +215,11 @@ You can avoid the interactive mode by having the required input files available
ibmcloud_region = "syd"
ibmcloud_zone = "syd04"
service_instance_id = "123456abc-xzz-2223434343"
rhel_image_name = "rhel-83-12082020"
rhcos_image_name = "rhcos-10-09182020"
network_name = "ocp-net"
openshift_install_tarball = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/stable-4.10/openshift-install-linux.tar.gz"
openshift_client_tarball = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/stable-4.10/openshift-client-linux.tar.gz"
rhel_image_name = "rhel-83-12062022"
rhcos_image_name = "rhcos-411-08122022"
network_name = "ocp-net"
openshift_install_tarball = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/stable-4.11/openshift-install-linux.tar.gz"
openshift_client_tarball = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/stable-4.11/openshift-client-linux.tar.gz"
cluster_id_prefix = "test-ocp"
cluster_domain = "xip.io"
storage_type = "nfs"
Expand Down
4 changes: 2 additions & 2 deletions openshift-install-powervs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Where <args>:
Environment Variables:
IBMCLOUD_API_KEY IBM Cloud API key
RELEASE_VER OpenShift release version (Default: 4.10)
RELEASE_VER OpenShift release version (Default: 4.11)
ARTIFACTS_VERSION Tag or Branch name of ocp4-upi-powervs repository (Default: release-<RELEASE_VER>)
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 @@ -59,7 +59,7 @@ EOF
exit 0
}

RELEASE_VER=${RELEASE_VER:-"4.10"}
RELEASE_VER=${RELEASE_VER:-"4.11"}
ARTIFACTS_REPO=${ARTIFACTS_REPO:-"https://github.com/ocp-power-automation/ocp4-upi-powervs"}
ARTIFACTS_VERSION=${ARTIFACTS_VERSION:-"release-$RELEASE_VER"}
#ARTIFACTS_VERSION="v4.5.3"
Expand Down

0 comments on commit c4142b8

Please sign in to comment.