[node-patches] Change in ovirt-node[master]: Use "ssh" instead of "net" in the augeas template on EL7

[rbarry at redhat.com]

Ryan Barry has uploaded a new change for review.

Change subject: Use "ssh" instead of "net" in the augeas template on EL7
......................................................................

Use "ssh" instead of "net" in the augeas template on EL7

Since augeas has support now, and using "ssh" in kdump.conf is
required to make ssh kdumps work on EL7 (but we can't write from
a template without breaking engine features), use "net" and sub
out the key to "ssh" if it's EL7.

This is a temporary fix until augeas support is backported to EL6,
when we can just use "ssh" everywhere.

Change-Id: I0c2b73726354cfaea477d8e041a86914a6dd89fe
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1180371
Signed-off-by: Ryan Barry <rbarry at redhat.com>
---
M src/ovirt/node/config/defaults.py
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/11/41911/1

diff --git a/src/ovirt/node/config/defaults.py b/src/ovirt/node/config/defaults.py
index c393b94..6d72ef1 100755
--- a/src/ovirt/node/config/defaults.py
+++ b/src/ovirt/node/config/defaults.py
@@ -1227,6 +1227,11 @@
                         "--message-level 1 -d 31",
                         "net": ssh}
 
+                # Augeas support for setting "ssh" in kdump.conf is
+                # only present on EL7 for now
+                if system.is_min_el(7):
+                    vals["ssh"] = vals.pop("net")
+
                 _set_values(vals)
 
                 kdumpctl_cmd = system.which("kdumpctl")


-- 
To view, visit https://gerrit.ovirt.org/41911
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0c2b73726354cfaea477d8e041a86914a6dd89fe
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Ryan Barry <rbarry at redhat.com>