summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJhon Honce <jhonce@redhat.com>2015-06-01 10:40:08 -0700
committerJhon Honce <jhonce@redhat.com>2015-06-01 10:40:08 -0700
commit205b22f62b91deebaf87c1e33c8f76631d8ce2d5 (patch)
tree584c769a922ac9a8e142c4bd88a3ec685dbf817c
parent9873607d36f974114da1177451761ee053e38d71 (diff)
downloadopenshift-205b22f62b91deebaf87c1e33c8f76631d8ce2d5.tar.gz
openshift-205b22f62b91deebaf87c1e33c8f76631d8ce2d5.tar.bz2
openshift-205b22f62b91deebaf87c1e33c8f76631d8ce2d5.tar.xz
openshift-205b22f62b91deebaf87c1e33c8f76631d8ce2d5.zip
* Make fluentd deployment optional with openshift_use_fluentd
-rw-r--r--playbooks/common/openshift-master/config.yml2
-rw-r--r--playbooks/common/openshift-node/config.yml2
-rw-r--r--roles/openshift_common/tasks/main.yml1
3 files changed, 3 insertions, 2 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index 2566f979e..4df64e95f 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -6,7 +6,7 @@
roles:
- openshift_master
- { role: openshift_sdn_master, when: openshift.common.use_openshift_sdn | bool }
- - fluentd_master
+ - { 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 }}
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index b371312bc..70711e39b 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -96,7 +96,7 @@
roles:
- openshift_node
- { role: openshift_sdn_node, when: openshift.common.use_openshift_sdn | bool }
- - fluentd_node
+ - { role: fluentd_node, when: openshift.common.use_fluentd | bool }
tasks:
- name: Create group for deployment type
group_by: key=oo_nodes_deployment_type_{{ openshift.common.deployment_type }}
diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml
index c55677c3f..5bd8690a7 100644
--- a/roles/openshift_common/tasks/main.yml
+++ b/roles/openshift_common/tasks/main.yml
@@ -10,6 +10,7 @@
public_hostname: "{{ openshift_public_hostname | default(None) }}"
public_ip: "{{ openshift_public_ip | default(None) }}"
use_openshift_sdn: "{{ openshift_use_openshift_sdn | default(None) }}"
+ use_fluentd: "{{ openshift_use_fluentd | default(True) }}"
deployment_type: "{{ openshift_deployment_type }}"
- name: Set hostname
hostname: name={{ openshift.common.hostname }}