Skip to content

Commit

Permalink
Update the default OCP version to 4.7
Browse files Browse the repository at this point in the history
Signed-off-by: Yussuf Shaikh <yussuf.shaikh@ibm.com>
  • Loading branch information
yussufsh committed Mar 8, 2021
1 parent 07488ad commit fe34728
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ Where <args>:
Environment Variables:
IBMCLOUD_API_KEY IBM Cloud API key
RELEASE_VER OpenShift release version (Default: 4.6)
RELEASE_VER OpenShift release version (Default: 4.7)
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 @@ -171,19 +171,19 @@ Before running the script, you may choose to override some environment variables
### Different OpenShift Versions
By default OpenShift version 4.6 is installed.
By default OpenShift version 4.7 is installed.
If you want to install 4.5, then export the following variables
If you want to install 4.6, then export the following variables
`RELEASE_VER`: Default is 4.6
`RELEASE_VER`: Default is 4.7
```
$ export RELEASE_VER="4.5"
$ export RELEASE_VER="4.6"
```
`ARTIFACTS_VERSION`: Tag/Branch (eg: release-4.6, v4.5.1, 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.7, v4.5.1, 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.5"
$ export ARTIFACTS_VERSION="release-4.6"
```
### Non-interactive mode
Expand All @@ -202,8 +202,8 @@ You can avoid the interactive mode by having the required input files available
rhel_image_name = "rhel-83-12082020"
rhcos_image_name = "rhcos-46-09182020"
network_name = "ocp-net"
openshift_install_tarball = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/stable-4.6/openshift-install-linux.tar.gz"
openshift_client_tarball = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/stable-4.6/openshift-client-linux.tar.gz"
openshift_install_tarball = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/stable-4.7/openshift-install-linux.tar.gz"
openshift_client_tarball = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/stable-4.7/openshift-client-linux.tar.gz"
cluster_id_prefix = "test-ocp"
cluster_domain = "xip.io"
storage_type = "nfs"
Expand Down
6 changes: 3 additions & 3 deletions docs/setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ If the latest Terraform is already present in the system PATH then the script wi

Downloads the Terraform artifacts which is used to create the OpenShift 4 cluster on PowerVS at IBM Cloud.

The script uses environment variable ARTIFACTS_VERSION to download the [OCP on PowerVS](https://github.com/ocp-power-automation/ocp4-upi-powervs) code. ARTIFACTS_VERSION can set to the branch or tag name eg: release-4.5, release-4.6 _(default)_, v4.5.1, etc.
The script uses environment variable ARTIFACTS_VERSION to download the [OCP on PowerVS](https://github.com/ocp-power-automation/ocp4-upi-powervs) code. ARTIFACTS_VERSION can set to the branch or tag name eg: release-4.5, release-4.6, release-4.7 _(default)_, v4.5.1, etc.

Another environment variable you can set is RELEASE_VER to the OpenShift version you want to install. eg: 4.5, 4.6 _(default)_, etc.
Another environment variable you can set is RELEASE_VER to the OpenShift version you want to install. eg: 4.5, 4.6, 4.7 _(default)_, etc.


## Usage
Expand All @@ -43,7 +43,7 @@ Another environment variable you can set is RELEASE_VER to the OpenShift version
# openshift-install-powervs setup
[setup] Installing dependency packages and tools
[setup_tools] Verifying the latest packages and tools
[setup_artifacts] Downloading code artifacts release-4.6 in ./automation
[setup_artifacts] Downloading code artifacts release-4.7 in ./automation
Attempt: 1/5
[setup] SUCCESS: setup command completed!
Expand Down
4 changes: 2 additions & 2 deletions openshift-install-powervs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Where <args>:
Environment Variables:
IBMCLOUD_API_KEY IBM Cloud API key
RELEASE_VER OpenShift release version (Default: 4.6)
RELEASE_VER OpenShift release version (Default: 4.7)
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 @@ -58,7 +58,7 @@ EOF
exit 0
}

RELEASE_VER=${RELEASE_VER:-"4.6"}
RELEASE_VER=${RELEASE_VER:-"4.7"}
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 fe34728

Please sign in to comment.