Signed-off-by: Scott Seago <sseago(a)redhat.com>
---
src/app/models/deployment.rb | 2 +-
src/app/models/realm_backend_target.rb | 8 ++++++++
src/app/util/condormatic.rb | 8 +++++---
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/app/models/deployment.rb b/src/app/models/deployment.rb
index cd5371f..65423e9 100644
--- a/src/app/models/deployment.rb
+++ b/src/app/models/deployment.rb
@@ -132,7 +132,7 @@ class Deployment < ActiveRecord::Base
instance = Instance.create!(
:deployment => self,
:name => "#{name}/#{assembly.name}",
- :frontend_realm => realm,
+ :frontend_realm => frontend_realm,
:pool => pool,
:image_uuid => assembly.image_id,
:image_build_uuid => assembly.image_build,
diff --git a/src/app/models/realm_backend_target.rb
b/src/app/models/realm_backend_target.rb
index df75582..8fbb5d5 100644
--- a/src/app/models/realm_backend_target.rb
+++ b/src/app/models/realm_backend_target.rb
@@ -16,4 +16,12 @@ class RealmBackendTarget < ActiveRecord::Base
belongs_to :provider, :class_name => 'Provider', :foreign_key =>
'realm_or_provider_id'
validates_uniqueness_of :frontend_realm_id, :scope => [:realm_or_provider_id,
:realm_or_provider_type]
+
+ def target_realm
+ (realm_or_provider_type == "Realm") ? realm : nil
+ end
+
+ def target_provider
+ (realm_or_provider_type == "Realm") ? realm.provider : provider
+ end
end
diff --git a/src/app/util/condormatic.rb b/src/app/util/condormatic.rb
index 8d223f9..107ad6e 100644
--- a/src/app/util/condormatic.rb
+++ b/src/app/util/condormatic.rb
@@ -50,9 +50,11 @@ def match(instance)
provider_images.select {|pi| pi.provider == account.provider}.each do |pi|
if not instance.frontend_realm.nil?
- instance.frontend_realm.realm_backend_targets.each do |brealm|
- possibles << Possible.new(pool_family, account, hwp, pi,
- brealm.realm)
+ instance.frontend_realm.realm_backend_targets.each do |brealm_target|
+ if brealm_target.target_provider == account.provider
+ possibles << Possible.new(pool_family, account, hwp, pi,
+ brealm_target.target_realm)
+ end
end
else
possibles << Possible.new(pool_family, account, hwp, pi, nil)
--
1.7.4.4