diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-10-10 13:10:23 -0400 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-10-11 11:45:04 -0400 |
| commit | bb1d5f45255d60a88a3220ea7e7b724a073465b1 (patch) | |
| tree | 7917fefb2a817c3f5446c8c6f8d489526651ee1c /roles/openshift_node | |
| parent | c38f63cc4a7e8cf2942e5bc83ee92fbea7aa59fe (diff) | |
| download | openshift-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_node')
| -rw-r--r-- | roles/openshift_node/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/config/configure-node-settings.yml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/roles/openshift_node/defaults/main.yml b/roles/openshift_node/defaults/main.yml index 1214c08e5..298d1013f 100644 --- a/roles/openshift_node/defaults/main.yml +++ b/roles/openshift_node/defaults/main.yml @@ -1,4 +1,6 @@ --- +openshift_node_debug_level: "{{ debug_level | default(2) }}" + r_openshift_node_firewall_enabled: "{{ os_firewall_enabled | default(True) }}" r_openshift_node_use_firewalld: "{{ os_firewall_use_firewalld | default(False) }}" diff --git a/roles/openshift_node/tasks/config/configure-node-settings.yml b/roles/openshift_node/tasks/config/configure-node-settings.yml index 1186062eb..527580481 100644 --- a/roles/openshift_node/tasks/config/configure-node-settings.yml +++ b/roles/openshift_node/tasks/config/configure-node-settings.yml @@ -7,7 +7,7 @@ create: true with_items: - regex: '^OPTIONS=' - line: "OPTIONS=--loglevel={{ openshift.node.debug_level | default(2) }}" + line: "OPTIONS=--loglevel={{ openshift_node_debug_level }}" - regex: '^CONFIG_FILE=' line: "CONFIG_FILE={{ openshift.common.config_base }}/node/node-config.yaml" - regex: '^IMAGE_VERSION=' |