diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-10-11 13:30:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-11 13:30:43 -0400 |
| commit | e30fdf9f1c3e5b9655b56a41c3691a61fdc775aa (patch) | |
| tree | ebc5680f24e37a49c97fbf96bfc5ee0405eb99df | |
| parent | 131bcdcd7ee5c3191c748beb7aad8d45c4477b98 (diff) | |
| parent | 5bf011aee30cd566d1a1364e863287e05a639299 (diff) | |
| download | openshift-e30fdf9f1c3e5b9655b56a41c3691a61fdc775aa.tar.gz openshift-e30fdf9f1c3e5b9655b56a41c3691a61fdc775aa.tar.bz2 openshift-e30fdf9f1c3e5b9655b56a41c3691a61fdc775aa.tar.xz openshift-e30fdf9f1c3e5b9655b56a41c3691a61fdc775aa.zip | |
Merge pull request #2584 from jhcook/variable_with_no_default_2576
set defaults for debug_level in template and task
| -rw-r--r-- | roles/openshift_master/templates/atomic-openshift-master.j2 | 2 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/systemd_units.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_master/templates/atomic-openshift-master.j2 b/roles/openshift_master/templates/atomic-openshift-master.j2 index 10eaeb401..26f0240ec 100644 --- a/roles/openshift_master/templates/atomic-openshift-master.j2 +++ b/roles/openshift_master/templates/atomic-openshift-master.j2 @@ -1,4 +1,4 @@ -OPTIONS=--loglevel={{ openshift.master.debug_level }} +OPTIONS=--loglevel={{ openshift.master.debug_level | default(2) }} CONFIG_FILE={{ openshift_master_config_file }} {% if openshift.common.is_containerized | bool %} IMAGE_VERSION={{ openshift_image_tag }} diff --git a/roles/openshift_node/tasks/systemd_units.yml b/roles/openshift_node/tasks/systemd_units.yml index a2192a4d0..40d1dd50b 100644 --- a/roles/openshift_node/tasks/systemd_units.yml +++ b/roles/openshift_node/tasks/systemd_units.yml @@ -40,7 +40,7 @@ create: true with_items: - regex: '^OPTIONS=' - line: "OPTIONS=--loglevel={{ openshift.node.debug_level }}" + line: "OPTIONS=--loglevel={{ openshift.node.debug_level | default(2) }}" - regex: '^CONFIG_FILE=' line: "CONFIG_FILE={{ openshift_node_config_file }}" - regex: '^IMAGE_VERSION=' |