Merge pull request #17785 from jameswnl/workflow5

Graph refresh of configuration_scripts and configuration_workflows in one InventoryCollection
ManageIQ · Aug 1, 2018 · 3777928 · 3777928
2 parents b44e073 + 264e4c0
commit 3777928
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 8 deletions.
diff --git a/app/models/manageiq/providers/embedded_ansible/automation_manager.rb b/app/models/manageiq/providers/embedded_ansible/automation_manager.rb
@@ -26,8 +26,6 @@ class ManageIQ::Providers::EmbeddedAnsible::AutomationManager < ManageIQ::Provid
   require_nested :Refresher
   require_nested :RefreshWorker
 
-  has_many :configuration_workflows, :dependent => :destroy, :foreign_key => "manager_id", :inverse_of => :manager
-
   def self.ems_type
     @ems_type ||= "embedded_ansible_automation".freeze
   end

diff --git a/app/models/manager_refresh/inventory_collection/builder/automation_manager.rb b/app/models/manager_refresh/inventory_collection/builder/automation_manager.rb
@@ -19,11 +19,6 @@ def configuration_script_sources
           add_common_default_values
         end
 
-        def configuration_workflows
-          default_manager_ref
-          add_common_default_values
-        end
-
         def configured_systems
           default_manager_ref
           add_common_default_values

diff --git a/spec/factories/ext_management_system.rb b/spec/factories/ext_management_system.rb
@@ -347,7 +347,7 @@
   trait(:configuration_workflow) do
     after(:create) do |x|
       type = (x.type.split("::")[0..2] + %w(AutomationManager ConfigurationWorkflow)).join("::")
-      x.configuration_workflows << FactoryGirl.create(:configuration_workflow, :type => type)
+      x.configuration_scripts << FactoryGirl.create(:configuration_workflow, :type => type)
     end
   end