Merge pull request #17848 from jameswnl/revert

switch back to require_nested due to linux load error
ManageIQ · Aug 13, 2018 · 42289df · 42289df
2 parents 45aa7a5 + 5d77b2d
commit 42289df
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/app/models/manageiq/providers/embedded_ansible/automation_manager.rb b/app/models/manageiq/providers/embedded_ansible/automation_manager.rb
@@ -1,6 +1,30 @@
 class ManageIQ::Providers::EmbeddedAnsible::AutomationManager < ManageIQ::Providers::EmbeddedAutomationManager
   include ManageIQ::Providers::AnsibleTower::Shared::AutomationManager
-  require_nested_all
+
+  require_nested :Credential
+  require_nested :AmazonCredential
+  require_nested :AzureCredential
+  require_nested :CloudCredential
+  require_nested :GoogleCredential
+  require_nested :MachineCredential
+  require_nested :VaultCredential
+  require_nested :NetworkCredential
+  require_nested :OpenstackCredential
+  require_nested :ScmCredential
+  require_nested :VmwareCredential
+  require_nested :RhvCredential
+
+  require_nested :ConfigurationScript
+  require_nested :ConfigurationScriptSource
+  require_nested :ConfigurationWorkflow
+  require_nested :ConfiguredSystem
+  require_nested :EventCatcher
+  require_nested :EventParser
+  require_nested :Inventory
+  require_nested :Job
+  require_nested :Playbook
+  require_nested :Refresher
+  require_nested :RefreshWorker
 
   def self.ems_type
     @ems_type ||= "embedded_ansible_automation".freeze

diff --git a/app/models/manageiq/providers/embedded_automation_manager.rb b/app/models/manageiq/providers/embedded_automation_manager.rb
@@ -1,5 +1,10 @@
 class ManageIQ::Providers::EmbeddedAutomationManager < ManageIQ::Providers::AutomationManager
-  require_nested_all
+  require_nested :Authentication
+  require_nested :ConfigurationScript
+  require_nested :ConfigurationScriptPayload
+  require_nested :ConfigurationScriptSource
+  require_nested :ConfiguredSystem
+  require_nested :OrchestrationStack
 
   def supported_catalog_types
     %w(generic_ansible_playbook)