From c06b70226b62eb6074e607cd6077e09c92412547 Mon Sep 17 00:00:00 2001
From: Nicolas MASSE <nicolas.masse@itix.fr>
Date: Fri, 14 Jul 2017 17:44:50 +0200
Subject: [PATCH] fix test inventory and add prod inventory

---
 prod.hosts | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 test.hosts | 21 ++++++++-----------
 2 files changed, 69 insertions(+), 12 deletions(-)
 create mode 100644 prod.hosts

diff --git a/prod.hosts b/prod.hosts
new file mode 100644
index 0000000..a841031
--- /dev/null
+++ b/prod.hosts
@@ -0,0 +1,60 @@
+#
+# Variables used by my playbook
+#
+[lab:vars]
+lab_dns_suffix=itix.fr
+docker_storage_vg=storage
+
+[lab:children]
+masters
+
+#
+# Shared variables used by both openshift-ansible and my playbook
+#
+[all:vars]
+# Default route suffix
+openshift_master_default_subdomain=app.itix.fr
+
+[masters]
+openshift.itix.fr
+
+[nodes]
+openshift.itix.fr openshift_schedulable=true openshift_node_labels='{ "workload-infra": "true", "workload-app": "true" }'
+
+#
+# The rest is used only by the OpenShift installer playbook
+#
+[OSEv3:children]
+masters
+nodes
+
+[OSEv3:vars]
+# Yes, we need to use sudo
+ansible_become=yes
+
+# what to install
+deployment_type=origin
+
+# New installation method : everything in containers !
+contenairized=true
+
+# Clustering method
+openshift_master_cluster_method=native
+
+# Bypass Registry Security Checks
+openshift_docker_insecure_registries=172.30.0.0/16
+
+# default project node selector
+osm_default_node_selector='workload-app=true'
+
+# Make sure NTP is enabled
+openshift_clock_enabled=true
+
+# default router
+openshift_hosted_router_selector='workload-infra=true'
+
+# Do not create the default project "my-project"
+openshift_additional_projects={}
+
+# Enable the "flat network" SDN
+os_sdn_network_plugin_name='redhat/openshift-ovs-subnet'
diff --git a/test.hosts b/test.hosts
index e8615bc..871c1c4 100644
--- a/test.hosts
+++ b/test.hosts
@@ -1,11 +1,11 @@
 #
 # Variables used by my playbook
 #
-[allinone:vars]
-lab_dns_suffix=itix.test
+[lab:vars]
+lab_dns_suffix=itix.work
 docker_storage_vg=docker
 
-[allinone:children]
+[lab:children]
 masters
 
 #
@@ -13,13 +13,13 @@ masters
 #
 [all:vars]
 # Default route suffix
-openshift_master_default_subdomain=app.itix.test
+openshift_master_default_subdomain=app.itix.work
 
 [masters]
-openshift.itix.test
+openshift.itix.work
 
 [nodes]
-openshift.itix.test openshift_node_labels='{ "workload": "infra", "workload": "app" }'
+openshift.itix.work openshift_schedulable=true openshift_node_labels='{ "workload-infra": "true", "workload-app": "true" }'
 
 #
 # The rest is used only by the OpenShift installer playbook
@@ -44,20 +44,17 @@ openshift_master_cluster_method=native
 # Bypass Registry Security Checks
 openshift_docker_insecure_registries=172.30.0.0/16
 
-# Disable any authentication
-openshift_master_identity_providers=[{'name': 'allow_all', 'login': 'true', 'challenge': 'true', 'kind': 'AllowAllPasswordIdentityProvider'}]
-
 # default project node selector
-osm_default_node_selector='workload=app'
+osm_default_node_selector='workload-app=true'
 
 # Make sure NTP is enabled
 openshift_clock_enabled=true
 
 # default router
-openshift_hosted_router_selector='workload=infra'
+openshift_hosted_router_selector='workload-infra=true'
 
 # Do not create the default project "my-project"
 openshift_additional_projects={}
 
 # Enable the multitenant SDN
-os_sdn_network_plugin_name='redhat/openshift-ovs-multitenant'
+os_sdn_network_plugin_name='redhat/openshift-ovs-subnet'