diff --git a/README.md b/README.md index be16306..2cee1f0 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ This project shows you how to set up OpenShift on AWS using Terraform. This the companion project to my article [Get up and running with OpenShift on AWS](http://www.dwmkerr.com/get-up-and-running-with-openshift-on-aws/). -![OpenShift Sample Project](./docs/okd_3.10_screenshot.png) +![OpenShift Sample Project](./docs/okd_3.11_screenshot.png) I am also adding some 'recipes' which you can use to mix in more advanced features: @@ -219,12 +219,12 @@ When you run `make openshift`, all that happens is the `inventory.template.cfg` ## Choosing the OpenShift Version -Currently, OKD 3.10 is installed. +Currently, OKD 3.11 is installed. To change the version, you can attempt to update the version identifier in this line of the [`./install-from-bastion.sh`](./install-from-bastion.sh) script: ```bash -git clone -b release-3.10 https://github.com/openshift/openshift-ansible +git clone -b release-3.11 https://github.com/openshift/openshift-ansible ``` However, this may not work if the version you change to requires a different setup. To allow people to install earlier versions, stable branches are available. Available versions are listed [here](https://github.com/openshift/openshift-ansible#getting-the-correct-version). @@ -232,6 +232,7 @@ However, this may not work if the version you change to requires a different set | Version | Status | Branch | |---------|---------------------|------------------------------------------------------------------------------------------------| +| 3.11 | Work in Progress | [`release/okd-3.11`](https://github.com/dwmkerr/terraform-aws-openshift/tree/release/okd-3.11) | | 3.10 | Tested successfully | [`release/okd-3.10`](https://github.com/dwmkerr/terraform-aws-openshift/tree/release/okd-3.10) | | 3.9 | Tested successfully | [`release/ocp-3.9`](https://github.com/dwmkerr/terraform-aws-openshift/tree/release/ocp-3.9) | | 3.8 | Untested | | diff --git a/docs/okd_3.11_screenshot.png b/docs/okd_3.11_screenshot.png new file mode 100644 index 0000000..a958f93 Binary files /dev/null and b/docs/okd_3.11_screenshot.png differ diff --git a/install-from-bastion.sh b/install-from-bastion.sh index 2c9588c..212dac8 100644 --- a/install-from-bastion.sh +++ b/install-from-bastion.sh @@ -6,9 +6,13 @@ sudo -E su # Install dev tools. yum install -y "@Development Tools" python2-pip openssl-devel python-devel gcc libffi-devel -# Get the OpenShift 3.10 installer. +# Get the OKD 3.11 installer. pip install -I ansible==2.6.5 -git clone -b release-3.10 https://github.com/openshift/openshift-ansible +git clone -b release-3.11 https://github.com/openshift/openshift-ansible + +# # Get the OpenShift 3.10 installer. +# pip install -I ansible==2.6.5 +# git clone -b release-3.10 https://github.com/openshift/openshift-ansible # Get the OpenShift 3.9 installer. # pip install -I ansible==2.4.3.0 diff --git a/inventory.template.cfg b/inventory.template.cfg index 180e7ef..2583c46 100644 --- a/inventory.template.cfg +++ b/inventory.template.cfg @@ -18,9 +18,9 @@ ansible_ssh_user=ec2-user # If ansible_ssh_user is not root, ansible_become must be set to true ansible_become=true -# Deploy OKD 3.10. +# Deploy OKD 3.11. openshift_deployment_type=origin -openshift_release=v3.10 +openshift_release=v3.11 # We need a wildcard DNS setup for our public access to services, fortunately # we can use the superb xip.io to get one for free.