Merge pull request #113 from agrare/delegate_refresh_to_configuration…

…_manager

Delegate Provisioning refresh to Configuration

(cherry picked from commit 91fb022)

app/models/manageiq/providers/foreman/configuration_manager/refresh_worker.rb

@@ -4,16 +4,4 @@ class ManageIQ::Providers::Foreman::ConfigurationManager::RefreshWorker < MiqEms
   def self.settings_name
     :ems_refresh_worker_foreman_configuration
   end
-
-  # overriding queue_name_for_ems so PerEmsWorkerMixin picks up *all* of the
-  # Foreman-managers from here.
-  # This way, the refresher for Foreman's ConfigurationManager will refresh *all*
-  # of the inventory across all managers.
-  class << self
-    def queue_name_for_ems(ems)
-      return ems unless ems.kind_of?(ExtManagementSystem)
-
-      ems.provider.managers.collect(&:queue_name).sort
-    end
-  end
 end

app/models/manageiq/providers/foreman/provisioning_manager.rb

@@ -1,6 +1,4 @@
 class ManageIQ::Providers::Foreman::ProvisioningManager < ManageIQ::Providers::ProvisioningManager
-  require_nested :Refresher
-
   delegate :authentication_check,
            :authentication_status,
            :authentication_status_ok?,
@@ -11,8 +9,13 @@ class ManageIQ::Providers::Foreman::ProvisioningManager < ManageIQ::Providers::P
            :endpoints=,
            :verify_credentials,
            :with_provider_connection,
+           :configuration_manager,
            :to => :provider
 
+  delegate :refresh,
+           :refresh_ems,
+           :to => :configuration_manager
+
   class << self
     delegate :params_for_create,
              :verify_credentials,

config/settings.yml

@@ -6,8 +6,6 @@
 :ems_refresh:
   :foreman_configuration:
     :refresh_interval: 15.minutes
-  :foreman_provisioning:
-    :refresh_interval: 1.hour
 :http_proxy:
   :foreman:
     :host: