search for: openstack_binary

...eletions(-) diff --git a/v2v/output_openstack.ml b/v2v/output_openstack.ml index b5bbc9195..238ec99a9 100644 --- a/v2v/output_openstack.ml +++ b/v2v/output_openstack.ml @@ -28,6 +28,9 @@ open Common_gettext.Gettext open Types open Utils +(* Name of the openstack CLI program (on $PATH). *) +let openstack_binary = "openstack" + (* Timeout waiting for new Cinder volumes to move to "available" state. * We assume this could be quite a long time on backends which want * to preallocate the storage. @@ -172,13 +175,20 @@ class output_openstack output_conn output_password output_storage...

...out to 5 minutes. Thanks: Ming Xie. --- v2v/output_openstack.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2v/output_openstack.ml b/v2v/output_openstack.ml index caaedf452..e395ccb37 100644 --- a/v2v/output_openstack.ml +++ b/v2v/output_openstack.ml @@ -38,7 +38,7 @@ let openstack_binary = "openstack" let available_timeout = 300 (* seconds *) (* Timeout waiting for Cinder volumes to attach to the appliance. *) -let attach_timeout = 60 (* seconds *) +let attach_timeout = 300 (* seconds *) (* The -oo options supported by this output method. *) type os_options = { --...

Random old patch that I had in my queue. Posting it as a backup, it is still untested. Rich.

...git a/v2v/output_openstack.ml b/v2v/output_openstack.ml index 179b0edf..39f30c9e 100644 --- a/v2v/output_openstack.ml +++ b/v2v/output_openstack.ml @@ -191,8 +191,7 @@ class output_openstack output_conn output_password output_storage let run_openstack_command_capture_json args = let cmd = [ openstack_binary ] @ extra_args @ args in - let json, chan = Filename.open_temp_file "v2vopenstack" ".json" in - unlink_on_exit json; + let json, chan = Filename.open_temp_file ~temp_dir:tmpdir "v2vopenstack" ".json" in let fd = descr_of_out_channel chan in...

Since this new temporary directory will contain UNIX sockets for communicating with nbdkit, then its path must not be too long. Use the existing directory that libguestfs exposes for this, i.e. sockdir. --- v2v/nbdkit.ml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/v2v/nbdkit.ml b/v2v/nbdkit.ml index 65317f9b..46b20c9d 100644 --- a/v2v/nbdkit.ml +++ b/v2v/nbdkit.ml