diff --git a/app/models/manageiq/providers/foreman/configuration_manager/refresh_worker.rb b/app/models/manageiq/providers/foreman/configuration_manager/refresh_worker.rb index b569fda..ebd5157 100644 --- a/app/models/manageiq/providers/foreman/configuration_manager/refresh_worker.rb +++ b/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 diff --git a/app/models/manageiq/providers/foreman/provisioning_manager.rb b/app/models/manageiq/providers/foreman/provisioning_manager.rb index fefa4e4..473b268 100644 --- a/app/models/manageiq/providers/foreman/provisioning_manager.rb +++ b/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, diff --git a/app/models/manageiq/providers/foreman/provisioning_manager/refresher.rb b/app/models/manageiq/providers/foreman/provisioning_manager/refresher.rb deleted file mode 100644 index fbff98e..0000000 --- a/app/models/manageiq/providers/foreman/provisioning_manager/refresher.rb +++ /dev/null @@ -1,6 +0,0 @@ -module ManageIQ::Providers - module Foreman - class ProvisioningManager::Refresher < ManageIQ::Providers::BaseManager::Refresher - end - end -end diff --git a/config/settings.yml b/config/settings.yml index dd8ea45..bf5bfa6 100644 --- a/config/settings.yml +++ b/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: