diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-10-11 11:52:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-11 11:52:42 -0400 |
| commit | 7b5cc97271ae834b9f2e64ec2b17f4ea3208017f (patch) | |
| tree | 7917fefb2a817c3f5446c8c6f8d489526651ee1c /roles/openshift_node_upgrade | |
| parent | c38f63cc4a7e8cf2942e5bc83ee92fbea7aa59fe (diff) | |
| parent | bb1d5f45255d60a88a3220ea7e7b724a073465b1 (diff) | |
| download | openshift-7b5cc97271ae834b9f2e64ec2b17f4ea3208017f.tar.gz openshift-7b5cc97271ae834b9f2e64ec2b17f4ea3208017f.tar.bz2 openshift-7b5cc97271ae834b9f2e64ec2b17f4ea3208017f.tar.xz openshift-7b5cc97271ae834b9f2e64ec2b17f4ea3208017f.zip | |
Merge pull request #5716 from mgugino-upstream-stage/fix-debug_level
Fix broken debug_level
Diffstat (limited to 'roles/openshift_node_upgrade')
4 files changed, 4 insertions, 3 deletions
diff --git a/roles/openshift_node_upgrade/README.md b/roles/openshift_node_upgrade/README.md index c7c0ff34a..73b98ad90 100644 --- a/roles/openshift_node_upgrade/README.md +++ b/roles/openshift_node_upgrade/README.md @@ -49,7 +49,6 @@ From openshift.node: | Name | Default Value | | |------------------------------------|---------------------|---------------------| -| openshift.node.debug_level |---------------------|---------------------| | openshift.node.node_image |---------------------|---------------------| | openshift.node.ovs_image |---------------------|---------------------| diff --git a/roles/openshift_node_upgrade/defaults/main.yml b/roles/openshift_node_upgrade/defaults/main.yml index 6507b015d..10b4c6977 100644 --- a/roles/openshift_node_upgrade/defaults/main.yml +++ b/roles/openshift_node_upgrade/defaults/main.yml @@ -1,4 +1,6 @@ --- +openshift_node_debug_level: "{{ debug_level | default(2) }}" + openshift_use_openshift_sdn: True os_sdn_network_plugin_name: "redhat/openshift-ovs-subnet" diff --git a/roles/openshift_node_upgrade/tasks/config/configure-node-settings.yml b/roles/openshift_node_upgrade/tasks/config/configure-node-settings.yml index 1186062eb..527580481 100644 --- a/roles/openshift_node_upgrade/tasks/config/configure-node-settings.yml +++ b/roles/openshift_node_upgrade/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=' diff --git a/roles/openshift_node_upgrade/tasks/systemd_units.yml b/roles/openshift_node_upgrade/tasks/systemd_units.yml index afff2f8ba..226f5290c 100644 --- a/roles/openshift_node_upgrade/tasks/systemd_units.yml +++ b/roles/openshift_node_upgrade/tasks/systemd_units.yml @@ -6,7 +6,7 @@ # - openshift.node.ovs_image # - openshift_use_openshift_sdn # - openshift.common.service_type -# - openshift.node.debug_level +# - openshift_node_debug_level # - openshift.common.config_base # - openshift.common.http_proxy # - openshift.common.portal_net |