summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/defaults
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-10-10 13:10:23 -0400
committerMichael Gugino <mgugino@redhat.com>2017-10-11 11:45:04 -0400
commitbb1d5f45255d60a88a3220ea7e7b724a073465b1 (patch)
tree7917fefb2a817c3f5446c8c6f8d489526651ee1c /roles/openshift_master/defaults
parentc38f63cc4a7e8cf2942e5bc83ee92fbea7aa59fe (diff)
downloadopenshift-bb1d5f45255d60a88a3220ea7e7b724a073465b1.tar.gz
openshift-bb1d5f45255d60a88a3220ea7e7b724a073465b1.tar.bz2
openshift-bb1d5f45255d60a88a3220ea7e7b724a073465b1.tar.xz
openshift-bb1d5f45255d60a88a3220ea7e7b724a073465b1.zip
Fix broken debug_level
Currently, debug_level is documented as a way to change the debug output level for both masters and nodes. debug_level does not currently have any effect. This commit removes debug_level from openshift_facts and properly sets openshift_master_debug_level and openshift_node_debug_level to the value of debug_level specified in the inventory. This commit also reorganizes some set_fact tasks needed during master upgrades to put all work-around set-facts for undefined variables in one place, allowing for easier cleanup in the future. This includes an entry for openshift_master_debug_level. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1500164
Diffstat (limited to 'roles/openshift_master/defaults')
-rw-r--r--roles/openshift_master/defaults/main.yml8
1 files changed, 8 insertions, 0 deletions
diff --git a/roles/openshift_master/defaults/main.yml b/roles/openshift_master/defaults/main.yml
index 73e935d3f..7e62a8c6d 100644
--- a/roles/openshift_master/defaults/main.yml
+++ b/roles/openshift_master/defaults/main.yml
@@ -1,4 +1,9 @@
---
+# openshift_master_defaults_in_use is a workaround to detect if we are consuming
+# the plays from the role or outside of the role.
+openshift_master_defaults_in_use: True
+openshift_master_debug_level: "{{ debug_level | default(2) }}"
+
r_openshift_master_firewall_enabled: "{{ os_firewall_enabled | default(True) }}"
r_openshift_master_use_firewalld: "{{ os_firewall_use_firewalld | default(False) }}"
@@ -26,6 +31,9 @@ oreg_auth_credentials_path: "{{ r_openshift_master_data_dir }}/.docker"
oreg_auth_credentials_replace: False
l_bind_docker_reg_auth: False
+containerized_svc_dir: "/usr/lib/systemd/system"
+ha_svc_template_path: "native-cluster"
+
# NOTE
# r_openshift_master_*_default may be defined external to this role.
# openshift_use_*, if defined, may affect other roles or play behavior.