From b9336a44a096481990c1a81b565770b850c6b938 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20Mass=C3=A9?= <nicolas.masse@itix.fr>
Date: Wed, 23 Aug 2017 11:40:39 +0200
Subject: [PATCH] fix #11: playbooks run on OCP 3.6

---
 allinone.hosts | 18 ++++++++++++++----
 allinone.yml   |  3 +++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/allinone.hosts b/allinone.hosts
index c371aa5..be9e639 100644
--- a/allinone.hosts
+++ b/allinone.hosts
@@ -3,8 +3,7 @@
 #
 [allinone:vars]
 lab_dns_suffix=openshift.test
-lab_openshift_version=3.5
-docker_storage_vg=docker
+lab_openshift_version=3.6
 
 [allinone:children]
 masters
@@ -21,10 +20,10 @@ ansible_ssh_user=redhat
 
 
 [masters]
-openshift35.openshift.test
+openshift36.openshift.test
 
 [nodes]
-openshift35.openshift.test openshift_schedulable=true openshift_node_labels="{'region': 'infra'}"
+openshift36.openshift.test openshift_schedulable=true openshift_node_labels="{'region': 'infra'}"
 
 #
 # The rest is used only by the OpenShift installer playbook
@@ -34,6 +33,17 @@ masters
 nodes
 
 [OSEv3:vars]
+# By default, OpenShift 3.6 checks that 16GB of memory is available,
+# which is way too much on a standard laptop...
+# It also checks for disk space on /var which can be an issue for a lab environment.
+openshift_disable_check=memory_availability,disk_availability
+
+# Deploy the Service Catalog (Warning: Tech Preview in OCP 3.6)
+openshift_enable_service_catalog=true
+
+# Use the hostpath-provisioner to allocate storage for the Service Catalog
+openshift_hosted_etcd_storage_kind=dynamic
+
 # Yes, we need to use sudo
 ansible_become=yes
 
diff --git a/allinone.yml b/allinone.yml
index bf03bb5..43e21f9 100644
--- a/allinone.yml
+++ b/allinone.yml
@@ -24,3 +24,6 @@
     - { name: 'microcks', tags: 'microcks' }
     - { name: 'sso', tags: 'sso' }
     - { name: '3scale', tags: '3scale' }
+
+  # Update OpenShift to the latest asynchronous errata updates
+  - include: "./openshift-ansible/playbooks/byo/openshift-cluster/upgrades/v3_6/upgrade.yml"