[node-patches] Change in ovirt-node[master]: Local kdump changes for EL7

[rbarry at redhat.com]

Ryan Barry has uploaded a new change for review.

Change subject: Local kdump changes for EL7
......................................................................

Local kdump changes for EL7

kdump continues to change, and kdumpctl wants the dump path to
exist.

Restarting the kdump service does things differently from
kdumpctl. Use kdumpctl.

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


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/12/36312/1

diff --git a/src/ovirt/node/config/defaults.py b/src/ovirt/node/config/defaults.py
index 08ec246..3d17ba0 100755
--- a/src/ovirt/node/config/defaults.py
+++ b/src/ovirt/node/config/defaults.py
@@ -1120,6 +1120,11 @@
                         "ext4": "/dev/HostVG/Data",
                         "path": "/core"}
 
+                # kdumpctl on EL7 doesn't like it if the path doesn't
+                # exist
+                if not os.path.isdir(os.path.join("/data", vals["path"])):
+                        os.makedirs(os.path.join("/data", vals["path"]))
+
                 _set_values(vals)
 
         class MountNFS(utils.Transaction.Element):
@@ -1252,7 +1257,13 @@
                 from ovirtnode.ovirtfunctions import unmount_config
 
                 try:
-                    system.service("kdump", "restart")
+                    if system.which("kdumpctl"):
+                        with open("/dev/null", "wb") as DEVNULL:
+                            utils.process.check_call(["kdumpctl", "restart"],
+                                                     stdout=DEVNULL,
+                                                     stderr=DEVNULL)
+                    else:
+                        system.service("kdump", "restart")
                 except utils.process.CalledProcessError as e:
                     self.logger.info("Failure while restarting kdump: %s" % e)
                     unmount_config("/etc/kdump.conf")


-- 
To view, visit http://gerrit.ovirt.org/36312
To unsubscribe, visit http://gerrit.ovirt.org/settings

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