feat: add support for origin 3.9

README.md

@@ -4,7 +4,7 @@
 
 This project shows you how to set up OpenShift Origin 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/openshift-sample.png)
+![OpenShift Sample Project](./docs/origin_3.9_screenshot.png)
 
 I am also adding some 'recipes' which you can use to mix in more advanced features:
 
@@ -219,22 +219,23 @@ When you run `make openshift`, all that happens is the `inventory.template.cfg`
 
 ## Choosing the OpenShift Version
 
-Currently, OpenShift 3.7 is installed.
+Currently, OpenShift 3.9 is installed.
 
 To change the version, just update the version identifier in this line of the [`./install-from-bastion.sh`](./install-from-bastion.sh) script:
 
 ```bash
-git clone -b release-3.6 https://github.com/openshift/openshift-ansible
+git clone -b release-3.9 https://github.com/openshift/openshift-ansible
 ```
 
 Available versions are listed [here](https://github.com/openshift/openshift-ansible#getting-the-correct-version).
 
 
 | Version | Status |
 |---------|--------|
-| 3.5     | Tested successfully. |
-| 3.6     | Tested successfully. |
-| 3.7     | Work in progress. |
+| 3.9     | Tested successfully |
+| 3.7     | [Work in progress](https://github.com/dwmkerr/terraform-aws-openshift/pull/43) |
+| 3.6     | Tested successfully |
+| 3.5     | Tested successfully |
 
 OpenShift 3.5 is fully tested, and has a slightly different setup. You can build 3.5 by checking out the [`release/openshift-3.5`](https://github.com/dwmkerr/terraform-aws-openshift/tree/release/openshift-3.5) branch.
 

install-from-bastion.sh

@@ -6,16 +6,21 @@ sudo -E su
 # Install dev tools.
 yum install -y "@Development Tools" python2-pip openssl-devel python-devel gcc libffi-devel
 
+# Get the OpenShift 3.9 installer.
+pip install -I ansible==2.4.3.0
+git clone -b release-3.9 https://github.com/openshift/openshift-ansible
+
 # Get the OpenShift 3.7 installer.
-pip install -Iv ansible==2.4.1.0
-git clone -b release-3.7 https://github.com/openshift/openshift-ansible
+# pip install -Iv ansible==2.4.1.0
+# git clone -b release-3.7 https://github.com/openshift/openshift-ansible
 
 # Get the OpenShift 3.6 installer.
 # pip install -Iv ansible==2.3.0.0
 # git clone -b release-3.6 https://github.com/openshift/openshift-ansible
 
 # Run the playbook.
-ANSIBLE_HOST_KEY_CHECKING=False /usr/local/bin/ansible-playbook -i ./inventory.cfg ./openshift-ansible/playbooks/byo/config.yml # uncomment for verbose! -vvv
+ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -i ./inventory.cfg ./openshift-ansible/playbooks/prerequisites.yml
+ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook -i ./inventory.cfg ./openshift-ansible/playbooks/deploy_cluster.yml
 
 # If needed, uninstall with the below:
 # ansible-playbook playbooks/adhoc/uninstall.yml

inventory.template.cfg

@@ -18,8 +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 OpenShift origin.
-deployment_type=origin
+# Deploy OpenShift Origin 3.9.
+openshift_deployment_type=origin
+openshift_release=v3.9
 
 # 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.

modules/openshift/01-tags.tf

@@ -20,7 +20,7 @@
 locals {
   common_tags = "${map(
     "Project", "openshift",
-    "KubernetesCluster", "${var.cluster_id}",
+    "KubernetesCluster", "${var.cluster_name}",
     "kubernetes.io/cluster/${var.cluster_name}", "${var.cluster_id}"
   )}"
 }