move configuration_scripts association up to ems

ManageIQ · Jul 12, 2018 · e4a7fc4 · e4a7fc4
1 parent 822d658
commit e4a7fc4
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/app/models/configuration_script.rb b/app/models/configuration_script.rb
@@ -2,5 +2,5 @@ class ConfigurationScript < ConfigurationScriptBase
  def self.base_model
  ConfigurationScript
  end
- belongs_to :manager, :class_name => "ExtManagementSystem", :inverse_of => :configuration_scripts_and_workflows
+ belongs_to :manager, :class_name => "ExtManagementSystem", :inverse_of => :configuration_scripts
 end
diff --git a/app/models/ext_management_system.rb b/app/models/ext_management_system.rb
@@ -76,8 +76,7 @@ def self.api_allowed_attributes
  has_many :miq_events, :as => :target, :dependent => :destroy
  has_many :cloud_subnets, :foreign_key => :ems_id, :dependent => :destroy
 
- has_many :configuration_scripts_and_workflows,
- :class_name => 'ConfigurationScript',
+ has_many :configuration_scripts,
  :dependent => :destroy,
  :foreign_key => "manager_id",
  :inverse_of => :manager

diff --git a/app/models/manageiq/providers/automation_manager.rb b/app/models/manageiq/providers/automation_manager.rb
@@ -11,7 +11,6 @@ class ManageIQ::Providers::AutomationManager < ManageIQ::Providers::BaseManager
 
  has_many :configured_systems, :dependent => :destroy, :foreign_key => "manager_id"
  has_many :configuration_profiles, :dependent => :destroy, :foreign_key => "manager_id"
- has_many :configuration_scripts, :dependent => :destroy, :foreign_key => "manager_id"
  has_many :configuration_workflows, :dependent => :destroy, :foreign_key => "manager_id", :inverse_of => :manager
  has_many :credentials, :class_name => "ManageIQ::Providers::AutomationManager::Authentication",
  :as => :resource, :dependent => :destroy