From: Martyn Taylor <mtaylor(a)redhat.com>
---
src/app/util/condormatic.rb | 2 ++
src/config/condor.yml | 1 +
2 files changed, 3 insertions(+), 0 deletions(-)
create mode 100644 src/config/condor.yml
diff --git a/src/app/util/condormatic.rb b/src/app/util/condormatic.rb
index b52ff46..45aa4bd 100644
--- a/src/app/util/condormatic.rb
+++ b/src/app/util/condormatic.rb
@@ -29,6 +29,7 @@ class Possible
@hwp = hwp
@provider_image = provider_image
@realm = realm
+ @condor_config = YAML.load_file("#{RAILS_ROOT}/config/condor.yml")
end
end
@@ -93,6 +94,7 @@ def condormatic_instance_create(task)
pipe_and_log(pipe, "DeltacloudUsername =
#{found.account.credentials_hash['username']}\n")
pipe_and_log(pipe, "DeltacloudPasswordFile = #{pwfilename}")
pipe_and_log(pipe, "DeltacloudImageId =
#{found.provider_image.target_identifier}\n")
+ pipe_and_log(pipe, "DeltacloudRetryTimeout =
#{@condor_config[:request_timeout]}\n")
pipe_and_log(pipe,
"DeltacloudHardwareProfile = #{found.hwp.external_key}\n")
pipe_and_log(pipe,
diff --git a/src/config/condor.yml b/src/config/condor.yml
new file mode 100644
index 0000000..9db1e5b
--- /dev/null
+++ b/src/config/condor.yml
@@ -0,0 +1 @@
+:request_timeout: 180
--
1.7.4