summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Coldrick <adam.coldrick@codethink.co.uk>2015-06-23 08:45:22 +0000
committerAdam Coldrick <adam.coldrick@codethink.co.uk>2015-06-23 08:45:25 +0000
commitc474118af3822acd9f15d965cb4d5cb42bd35023 (patch)
tree16e4745d1050eee35c6cf26bf5c04820fcfcc083
parente584911f83ae311227994a1d19e9e81371c51b42 (diff)
downloaddefinitions-c474118af3822acd9f15d965cb4d5cb42bd35023.tar.gz
More fixes for various deployment extensions
Some of the extensions had extraneous imports, and a couple didn't import things they used. The same bug as in the kvm deployment extension existed in the virtualbox deployment extension, and is fixed in this commit. Change-Id: I2bd8169818ce5444af522c135a9e0326c1212ce2
-rw-r--r--extensions/ceph.configure1
-rwxr-xr-xextensions/distbuild-trove-nfsboot.check1
-rwxr-xr-xextensions/nfsboot.check1
-rwxr-xr-xextensions/nfsboot.write3
-rwxr-xr-xextensions/rawdisk.write1
-rwxr-xr-xextensions/strip-gplv3.configure1
-rwxr-xr-xextensions/virtualbox-ssh.write8
7 files changed, 10 insertions, 6 deletions
diff --git a/extensions/ceph.configure b/extensions/ceph.configure
index 3b8b2603..190dda97 100644
--- a/extensions/ceph.configure
+++ b/extensions/ceph.configure
@@ -17,7 +17,6 @@
import os
import shutil
import stat
-import subprocess
import sys
import re
diff --git a/extensions/distbuild-trove-nfsboot.check b/extensions/distbuild-trove-nfsboot.check
index 76ba6dda..780d5e0a 100755
--- a/extensions/distbuild-trove-nfsboot.check
+++ b/extensions/distbuild-trove-nfsboot.check
@@ -17,7 +17,6 @@
import logging
import os
-import subprocess
import sys
import writeexts
diff --git a/extensions/nfsboot.check b/extensions/nfsboot.check
index 499fb537..979f5b1b 100755
--- a/extensions/nfsboot.check
+++ b/extensions/nfsboot.check
@@ -16,7 +16,6 @@
'''Preparatory checks for Morph 'nfsboot' write extension'''
import os
-import subprocess
import writeexts
diff --git a/extensions/nfsboot.write b/extensions/nfsboot.write
index 418f8eeb..281b83c3 100755
--- a/extensions/nfsboot.write
+++ b/extensions/nfsboot.write
@@ -34,8 +34,9 @@ in /srv/nfsboot/nfs/
'''
-import os
import glob
+import os
+import subprocess
import writeexts
diff --git a/extensions/rawdisk.write b/extensions/rawdisk.write
index cdeb5018..49d0a1e8 100755
--- a/extensions/rawdisk.write
+++ b/extensions/rawdisk.write
@@ -18,6 +18,7 @@
import os
+import subprocess
import sys
import time
import tempfile
diff --git a/extensions/strip-gplv3.configure b/extensions/strip-gplv3.configure
index 0c5250e4..e88e5c3f 100755
--- a/extensions/strip-gplv3.configure
+++ b/extensions/strip-gplv3.configure
@@ -24,6 +24,7 @@ to find the files created by that chunk, then remove them.
import json
import os
import re
+import subprocess
import sys
import writeexts
diff --git a/extensions/virtualbox-ssh.write b/extensions/virtualbox-ssh.write
index 95643a4a..86b813cc 100755
--- a/extensions/virtualbox-ssh.write
+++ b/extensions/virtualbox-ssh.write
@@ -96,10 +96,14 @@ class VirtualBoxPlusSshWriteExtension(writeexts.WriteExtension):
'dummy-argv0', 'vbox', vdi_path, str(st.st_size),
]
- subprocess.check_call(
+ xfer_hole_proc = subprocess.Popen(
['python', xfer_hole_path, raw_disk],
+ stdout=subprocess.PIPE)
+ recv_hole_proc = subprocess.Popen(
['ssh', ssh_host] + map(writeexts.shell_quote, ssh_remote_cmd),
- stdout=None, stderr=None)
+ stdin=xfer_hole_proc.stdout)
+ xfer_hole_proc.stdout.close()
+ recv_hole_proc.communicate()
def virtualbox_version(self, ssh_host):
'Get the version number of the VirtualBox running on the remote host.'