Diego Castro 9 anni fa
parent
commit
e1382004e4

+ 3 - 0
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

+ 1 - 0
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 }}

+ 1 - 2
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