[CRIU] [PATCH 1/5] p.haul: remove OVZ module

[Nikita Spiridonov]

It was bad idea to preserve OVZ module. OVZ module at the present
moment reuses VZ module logic for the most part, but as times goes
by OVZ requires additional effort to maintain its actuality. It
makes no sense since OVZ is obsolete, so remove it.

Signed-off-by: Nikita Spiridonov <nspiridonov at odin.com>
---
 p.haul               |    4 ++--
 phaul/p_haul_ovz.py  |   18 ------------------
 phaul/p_haul_type.py |    2 --
 3 files changed, 2 insertions(+), 22 deletions(-)
 delete mode 100644 phaul/p_haul_ovz.py

diff --git a/p.haul b/p.haul
index 415c591..00a3808 100755
--- a/p.haul
+++ b/p.haul
@@ -11,7 +11,7 @@ import phaul.xem_rpc as ph_xem_rpc
 #
 # E.g.
 #
-# # p.haul ovz 100 10.0.0.1
+# # p.haul vz 100 10.0.0.1
 #
 # or
 #
@@ -19,7 +19,7 @@ import phaul.xem_rpc as ph_xem_rpc
 #
 
 parser = argparse.ArgumentParser("Process HAULer")
-parser.add_argument("type", help = "Type of hat to haul, e.g. ovz")
+parser.add_argument("type", help = "Type of hat to haul, e.g. vz or lxc")
 parser.add_argument("id", help = "ID of what to haul")
 parser.add_argument("to", help = "IP where to haul")
 parser.add_argument("-v", help = "Verbosity level", default = ph_criu_api.def_verb, type = int, dest = "verbose")
diff --git a/phaul/p_haul_ovz.py b/phaul/p_haul_ovz.py
deleted file mode 100644
index bf719d0..0000000
--- a/phaul/p_haul_ovz.py
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# OpenVZ containers hauler module
-#
-
-import os
-import p_haul_vz
-
-name = "ovz"
-vzpid_dir = "/var/lib/vzctl/vepid/"
-
-class p_haul_type(p_haul_vz.p_haul_type):
-	def __init__(self, ctid):
-		p_haul_vz.p_haul_type.__init__(self, ctid)
-
-	def root_task_pid(self):
-		with open(os.path.join(vzpid_dir, self._ctid)) as pf:
-			pid = pf.read()
-			return int(pid)
diff --git a/phaul/p_haul_type.py b/phaul/p_haul_type.py
index 8cf1eb4..adf654e 100644
--- a/phaul/p_haul_type.py
+++ b/phaul/p_haul_type.py
@@ -5,13 +5,11 @@
 #
 
 import p_haul_vz
-import p_haul_ovz
 import p_haul_pid
 import p_haul_lxc
 
 haul_types = {
 	p_haul_vz.name: p_haul_vz,
-	p_haul_ovz.name: p_haul_ovz,
 	p_haul_pid.name: p_haul_pid,
 	p_haul_lxc.name: p_haul_lxc,
 }
-- 
1.7.1