From 1744778d4ffb5183020a5196c7ea020b18e1436a Mon Sep 17 00:00:00 2001
From: "Suren A. Chilingaryan" <csa@suren.me>
Date: Sat, 1 Apr 2017 23:08:57 +0200
Subject: Add openshift-ansible as submodule

---
 group_vars/OSEv3.yml | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

(limited to 'group_vars')

diff --git a/group_vars/OSEv3.yml b/group_vars/OSEv3.yml
index 5e19b7d..12cf400 100644
--- a/group_vars/OSEv3.yml
+++ b/group_vars/OSEv3.yml
@@ -7,38 +7,29 @@ openshift_release: "v1.5"
 openshift_image_tag: "v1.5.0-rc.0"
 openshift_hosted_metrics_deployer_version: "v1.5.0-rc.0"
 
-
 containerized: true
 openshift_master_cluster_method: "native"
+os_firewall_use_firewalld: true
+
+#Recommended to avoid: No package matching 'origin-docker-excluder-1.5.0*' found available
+enable_excluders: false
+enable_docker_excluder: false
 
 ### Configuration
-openshift_install_examples: true
+osm_use_cockpit: true
+osm_cockpit_plugins: ['cockpit-kubernetes']
 osn_storage_plugin_deps: ['ceph', 'glusterfs']
 openshift_hosted_metrics_deploy: true
-#openshift_metrics_project: openshift-infra
 ppenshift_hosted_metrics_storage_kind: dynamic
-# seems ignored, so lets set to default
-#openshift_metrics_hawkular_hostname: "hawkular-metrics.{{ ands_openshift_subdomain }}"
-
-
-openshift_master_pod_eviction_timeout: 30s
-
-# Verify that it does not cause problems
-os_firewall_use_firewalld: true
-
-
-# Alternative metrics & cockpit, this is purely documented so we keep it out
 #openshift_use_manageiq: true
-osm_use_cockpit: true
-osm_cockpit_plugins: ['cockpit-kubernetes']
-
-#Recommended to avoid: No package matching 'origin-docker-excluder-1.5.0*' found available
-enable_excluders: false
-enable_docker_excluder: false
+openshift_install_examples: true
 
 # Required for IPFailover
 openshift_clock_enabled: true
 
+# Fine tunning
+openshift_master_pod_eviction_timeout: 30s
+
 ### Authentication
 openshift_master_identity_providers: [{'name': 'htpasswd_auth', 'login': 'true', 'challenge': 'true', 'kind': 'HTPasswdPasswordIdentityProvider', 'filename': '/etc/origin/master/htpasswd'}]
 openshift_master_htpasswd_users: {'pdv': '$apr1$ACvj6uUa$Nm1Vq8hZq3RzTtaYpAHv01', 'csa': '$apr1$IqEwdnzy$UAdd8ZSFnXommBbj29w3c0'}
@@ -49,7 +40,6 @@ openshift_master_cluster_hostname: "{{ ands_openshift_lb }}"
 openshift_master_default_subdomain: "{{ ands_openshift_subdomain }}"
 openshift_master_ingress_ip_network_cidr: "{{ ands_openshift_ingress_network }}"
 
-
 # Node configuration
 openshift_schedulable: true
 
@@ -62,4 +52,3 @@ openshift_public_hostname: "{{ ansible_hostname }}.{{ ands_cluster_domain }}"
 #openshift_public_hostname: "{{ ands_openshift_public_network | ipaddr(ands_host_id) | ipaddr('address') }}"
 
 openshift_node_labels: "{{ ands_openshift_labels }}"
-
-- 
cgit v1.2.3