summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-master
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-06-06 13:40:18 -0400
committerJason DeTiberus <jdetiber@redhat.com>2015-06-06 13:44:57 -0400
commit2283750d0ad8b24a823f034ebd6172526c535943 (patch)
tree86f98f293cda97848e072aa292d2d86c017caed9 /playbooks/common/openshift-master
parentaf8b0b25f5e572ab20e3c3efdba596bae7ae7563 (diff)
downloadopenshift-2283750d0ad8b24a823f034ebd6172526c535943.tar.gz
openshift-2283750d0ad8b24a823f034ebd6172526c535943.tar.bz2
openshift-2283750d0ad8b24a823f034ebd6172526c535943.tar.xz
openshift-2283750d0ad8b24a823f034ebd6172526c535943.zip
add use_fluentd to openshift_facts
- Move use_fluentd into openshift_facts proper - default use_fluentd to False unless deployment_type == origin
Diffstat (limited to 'playbooks/common/openshift-master')
-rw-r--r--playbooks/common/openshift-master/config.yml6
1 files changed, 4 insertions, 2 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index 4df64e95f..a9a4e6afc 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -5,8 +5,10 @@
openshift_sdn_master_url: https://{{ openshift.common.hostname }}:4001
roles:
- openshift_master
- - { role: openshift_sdn_master, when: openshift.common.use_openshift_sdn | bool }
- - { role: fluentd_master, when openshift.common.use_fluentd | bool }
+ - role: openshift_sdn_master
+ when: openshift.common.use_openshift_sdn | bool
+ - role: fluentd_master
+ when: openshift.common.use_fluentd | bool
tasks:
- name: Create group for deployment type
group_by: key=oo_masters_deployment_type_{{ openshift.common.deployment_type }}