Skip to content

Commit

Permalink
Merge pull request #211 from yussufsh/devel
Browse files Browse the repository at this point in the history
Use default ocp 4.12
  • Loading branch information
Power Cloud Robot authored Feb 1, 2023
2 parents 123f8bf + 8d0825f commit 8960478
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
15 changes: 7 additions & 8 deletions README.md
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.11)
RELEASE_VER OpenShift release version (Default: 4.12)
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 @@ -191,12 +191,11 @@ Before running the script, you may choose to override some environment variables
### Different OpenShift Versions
By default OpenShift version 4.11 is installed.
If you want to install 4.10, then export the variable `RELEASE_VER`: Default is 4.11
By default OpenShift version 4.12 is installed.
If you want to install 4.11, then export the variable `RELEASE_VER`.
```
$ export RELEASE_VER="4.10"
$ export RELEASE_VER="4.11"
```
`ARTIFACTS_VERSION`: Tag/Branch (eg: release-4.11, v4.11, main) of [ocp4-upi-powervs](https://github.com/ocp-power-automation/ocp4-upi-powervs) repository. Default is "main".
Expand All @@ -218,10 +217,10 @@ You can avoid the interactive mode by having the required input files available
ibmcloud_zone = "syd04"
service_instance_id = "123456abc-xzz-2223434343"
rhel_image_name = "rhel-83-12062022"
rhcos_image_name = "rhcos-411-08122022"
rhcos_image_name = "rhcos-412-02012023"
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"
openshift_install_tarball = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/stable-4.12/openshift-install-linux.tar.gz"
openshift_client_tarball = "https://mirror.openshift.com/pub/openshift-v4/ppc64le/clients/ocp/stable-4.12/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 @@ -49,7 +49,7 @@ Where <args>:
Environment Variables:
IBMCLOUD_API_KEY IBM Cloud API key
RELEASE_VER OpenShift release version (Default: 4.11)
RELEASE_VER OpenShift release version (Default: 4.12)
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 +60,7 @@ EOF
exit 0
}

RELEASE_VER=${RELEASE_VER:-"4.11"}
RELEASE_VER=${RELEASE_VER:-"4.12"}
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

0 comments on commit 8960478

Please sign in to comment.