summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Castro <spinolacastro@gmail.com>2015-08-12 20:05:11 -0300
committerDiego Castro <spinolacastro@gmail.com>2015-08-12 20:05:11 -0300
commite1382004e4c6e255878c0ca2b4621c901fba9225 (patch)
treebe55554c6d19b6fe2f5e09c732531557fa72b187
parentd307f715764164c8f543d57486718f95b1987875 (diff)
downloadopenshift-e1382004e4c6e255878c0ca2b4621c901fba9225.tar.gz
openshift-e1382004e4c6e255878c0ca2b4621c901fba9225.tar.bz2
openshift-e1382004e4c6e255878c0ca2b4621c901fba9225.tar.xz
openshift-e1382004e4c6e255878c0ca2b4621c901fba9225.zip
Configure Fluentd
-rw-r--r--inventory/byo/hosts.example3
-rw-r--r--roles/openshift_common/tasks/main.yml1
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py3
3 files changed, 5 insertions, 2 deletions
diff --git a/inventory/byo/hosts.example b/inventory/byo/hosts.example
index 629956d0e..f391475ca 100644
--- a/inventory/byo/hosts.example
+++ b/inventory/byo/hosts.example
@@ -38,6 +38,9 @@ deployment_type=enterprise
# Allow all auth
#openshift_master_identity_providers=[{'name': 'allow_all', 'login': 'true', 'challenge': 'true', 'kind': 'AllowAllPasswordIdentityProvider'}]
+# Configure Fluentd
+#use_fluentd=true
+
# master cluster ha variables using pacemaker or RHEL HA
#openshift_master_cluster_password=openshift_cluster
#openshift_master_cluster_vip=192.168.133.25
diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml
index a7c565067..e4d616067 100644
--- a/roles/openshift_common/tasks/main.yml
+++ b/roles/openshift_common/tasks/main.yml
@@ -12,6 +12,7 @@
use_openshift_sdn: "{{ openshift_use_openshift_sdn | default(None) }}"
sdn_network_plugin_name: "{{ os_sdn_network_plugin_name | default(None) }}"
deployment_type: "{{ openshift_deployment_type }}"
+ use_fluentd: "{{ openshift_use_fluentd | default(None) }}"
- name: Set hostname
hostname: name={{ openshift.common.hostname }}
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 4e0989c5f..7e74f9617 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -317,9 +317,8 @@ def set_fluentd_facts_if_unset(facts):
"""
if 'common' in facts:
- deployment_type = facts['common']['deployment_type']
if 'use_fluentd' not in facts['common']:
- use_fluentd = True if deployment_type == 'online' else False
+ use_fluentd = False
facts['common']['use_fluentd'] = use_fluentd
return facts