On 05/04/2011 12:38 PM, jtomasek(a)redhat.com wrote:
From: Jiri Tomasek<jtomasek(a)redhat.com>
---
.../resources/deployments_controller.rb | 2 +-
src/app/models/deployment.rb | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/app/controllers/resources/deployments_controller.rb
b/src/app/controllers/resources/deployments_controller.rb
index 81378f8..4dcca1f 100644
--- a/src/app/controllers/resources/deployments_controller.rb
+++ b/src/app/controllers/resources/deployments_controller.rb
@@ -29,7 +29,7 @@ class Resources::DeploymentsController< ApplicationController
@deployment.owner = current_user
if @deployment.save
flash[:notice] = "Deployment launched"
- errors = @deployment.launch(params[:hw_profiles], current_user)
+ errors = @deployment.launch(params[:hw_profiles] || {}, current_user)
unless errors.empty?
flash[:error] = {
:summary => "Failed to launch following assemblies:",
diff --git a/src/app/models/deployment.rb b/src/app/models/deployment.rb
index b75b49d..291e351 100644
--- a/src/app/models/deployment.rb
+++ b/src/app/models/deployment.rb
@@ -112,6 +112,7 @@ class Deployment< ActiveRecord::Base
# TODO: for now we try to start all instances even if some of them fails
begin
Instance.transaction do
+ hw_profile = hw_profiles[assembly.id.to_s]
instance = Instance.create!(
:deployment => self,
:name => "#{name}/#{assembly.name}",
@@ -120,7 +121,7 @@ class Deployment< ActiveRecord::Base
:assembly => assembly,
:state => Instance::STATE_NEW,
:owner => user,
- :hardware_profile =>
HardwareProfile.find(hw_profiles[assembly.id.to_s])
+ :hardware_profile => hw_profile ? HardwareProfile.find(hw_profile) :
nil
)
task = InstanceTask.create!({:user => user,
:task_target => instance,
ACK
--
No trees were killed to send this message, but a large number of
electrons were terribly inconvenienced.