summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-02-25 15:50:06 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-02-25 15:50:06 -0500
commitf8e0a3aded3bd96368971236e1e1c7a16d29929a (patch)
tree51813b74642a432eb9429b524f766b7e6bdf7529
parent65b9391f661f463255e4f705a2c58fc54cc1cf5e (diff)
parentdd2ac8e7e8c0101dff3fe7e7fcb4d884274e831e (diff)
downloadopenshift-f8e0a3aded3bd96368971236e1e1c7a16d29929a.tar.gz
openshift-f8e0a3aded3bd96368971236e1e1c7a16d29929a.tar.bz2
openshift-f8e0a3aded3bd96368971236e1e1c7a16d29929a.tar.xz
openshift-f8e0a3aded3bd96368971236e1e1c7a16d29929a.zip
Merge pull request #1462 from jkhelil/configure_log_level_from_cli
configure debug_level for master and node from cli
-rw-r--r--playbooks/common/openshift-master/config.yml5
-rw-r--r--playbooks/common/openshift-node/config.yml4
2 files changed, 9 insertions, 0 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index b9d595576..acd2f5b11 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -28,6 +28,11 @@
| default([]))
| oo_collect('openshift.common.hostname')
| default(none, true) }}"
+
+ - set_fact:
+ openshift_master_debug_level: "{{ lookup('oo_option', 'openshift_master_debug_level') | default(openshift.common.debug_level, true) }}"
+ when: openshift_master_debug_level is not defined
+
roles:
- openshift_facts
post_tasks:
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index 56d30e9b9..7edea9160 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -1,6 +1,10 @@
---
- name: Gather and set facts for node hosts
hosts: oo_nodes_to_config
+ pre_tasks:
+ - set_fact:
+ openshift_node_debug_level: "{{ lookup('oo_option', 'openshift_node_debug_level') | default(openshift.common.debug_level, true) }}"
+ when: openshift_node_debug_level is not defined
roles:
- openshift_facts
tasks: