Instead of calling a nonexistent python script.
Signed-off-by: Ben Lipton <[email protected]>
---
This time, let's fix the unit tests too!
p2v-transfer/p2v_transfer.py | 4 +---
p2v-transfer/test/p2v_transfer_test.py | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/p2v-transfer/p2v_transfer.py b/p2v-transfer/p2v_transfer.py
index cdf6ce0..b2fc12f 100755
--- a/p2v-transfer/p2v_transfer.py
+++ b/p2v-transfer/p2v_transfer.py
@@ -263,9 +263,7 @@ def RunFixScripts(client):
@param client: SSH client object used to connect to the instance.
"""
- #commands = fix_scripts.GetCommandsForOS("debian")
- #commands.run(client)
- _RunCommandAndWait(client, "/usr/lib/ganeti/fixes/run_fixes.py")
+ _RunCommandAndWait(client, "run-parts /usr/lib/ganeti/fixes")
def UnmountSourceFilesystems():
diff --git a/p2v-transfer/test/p2v_transfer_test.py
b/p2v-transfer/test/p2v_transfer_test.py
index d35e428..ebfb1e1 100755
--- a/p2v-transfer/test/p2v_transfer_test.py
+++ b/p2v-transfer/test/p2v_transfer_test.py
@@ -209,7 +209,7 @@ EOF
def testRunFixScriptsReportsFailure(self):
# Run the command, but have it exit with error
- self._MockRunCommandAndWait("/usr/lib/ganeti/fixes/run_fixes.py", 1)
+ self._MockRunCommandAndWait("run-parts /usr/lib/ganeti/fixes", 1)
self.mox.ReplayAll()
self.assertRaises(self.module.P2VError,
--
1.7.3.1
