diff --git a/Gemfile b/Gemfile index fbc3b00735f..fc9688344dc 100644 --- a/Gemfile +++ b/Gemfile @@ -170,7 +170,7 @@ group :smartstate, :manageiq_default do gem "manageiq-smartstate", "~>0.1.1", :require => false end -group :ui_dependencies, :manageiq_default do # Added to Bundler.require in config/application.rb +group :ui_dependencies do # Added to Bundler.require in config/application.rb manageiq_plugin "manageiq-ui-classic" # Modified gems (forked on Github) gem "font-fabulous", :git => "https://github.com/ManageIQ/font-fabulous.git", :branch => "master" # FIXME: this is just a temporary solution and it'll go to the ui-classic later diff --git a/Procfile.example b/Procfile.example index 047256cc906..a3751043cbf 100644 --- a/Procfile.example +++ b/Procfile.example @@ -6,21 +6,21 @@ # So, the first ui worker will get PORT=3000 while the next will get PORT=3001 # The first api worker will get PORT=3100 and the next will get PORT=3101 -# ui: env PORT=$PORT bundle exec rails r lib/workers/bin/run_single_worker.rb MiqUiWorker -# api: env PORT=$PORT bundle exec rails r lib/workers/bin/run_single_worker.rb MiqWebServiceWorker -# websocket: env PORT=$PORT bundle exec rails r lib/workers/bin/run_single_worker.rb MiqWebsocketWorker +# ui: env PORT=$PORT ruby lib/workers/bin/run_single_worker.rb MiqUiWorker +# api: env PORT=$PORT ruby lib/workers/bin/run_single_worker.rb MiqWebServiceWorker +# websocket: env PORT=$PORT ruby lib/workers/bin/run_single_worker.rb MiqWebsocketWorker -# schedule: bundle exec rails r lib/workers/bin/run_single_worker.rb MiqScheduleWorker +# schedule: ruby lib/workers/bin/run_single_worker.rb MiqScheduleWorker # Queue workers # These workers use a default queue defined in their classes # We do not need to pass them a queue name -# generic: bundle exec rails r lib/workers/bin/run_single_worker.rb MiqGenericWorker -# priority: bundle exec rails r lib/workers/bin/run_single_worker.rb MiqPriorityWorker -# event: bundle exec rails r lib/workers/bin/run_single_worker.rb MiqEventHandler -# reporting: bundle exec rails r lib/workers/bin/run_single_worker.rb MiqReportingWorker -# metrics_processor: bundle exec rails r lib/workers/bin/run_single_worker.rb MiqEmsMetricsProcessorWorker +# generic: ruby lib/workers/bin/run_single_worker.rb MiqGenericWorker +# priority: ruby lib/workers/bin/run_single_worker.rb MiqPriorityWorker +# event: ruby lib/workers/bin/run_single_worker.rb MiqEventHandler +# reporting: ruby lib/workers/bin/run_single_worker.rb MiqReportingWorker +# metrics_processor: ruby lib/workers/bin/run_single_worker.rb MiqEmsMetricsProcessorWorker # Provider workers # @@ -29,16 +29,16 @@ # VMware example # The following workers should be started to work with a VMware infrastructure EMS -# vim_broker: bundle exec rails r lib/workers/bin/run_single_worker.rb MiqVimBrokerWorker -# vmware_metrics: bundle exec rails r lib/workers/bin/run_single_worker.rb ManageIQ::Providers::Vmware::InfraManager::MetricsCollectorWorker +# vim_broker: ruby lib/workers/bin/run_single_worker.rb MiqVimBrokerWorker +# vmware_metrics: ruby lib/workers/bin/run_single_worker.rb ManageIQ::Providers::Vmware::InfraManager::MetricsCollectorWorker # Per EMS queue workers # These workers subscribe to a queue named based on the particular EMS they connect to # The "" tag in these lines should be replaced by the id of the manager instance these workers apply to -# vmware_refresh_: env QUEUE=ems_ bundle exec rails r lib/workers/bin/run_single_worker.rb ManageIQ::Providers::Vmware::InfraManager::RefreshWorker -# vmware_event_: env QUEUE=ems_ bundle exec rails r lib/workers/bin/run_single_worker.rb ManageIQ::Providers::Vmware::InfraManager::EventCatcher -# vmware_refresh_core_: env QUEUE=ems_ bundle exec rails r lib/workers/bin/run_single_worker.rb MiqEmsRefreshCoreWorker +# vmware_refresh_: env QUEUE=ems_ ruby lib/workers/bin/run_single_worker.rb ManageIQ::Providers::Vmware::InfraManager::RefreshWorker +# vmware_event_: env QUEUE=ems_ ruby lib/workers/bin/run_single_worker.rb ManageIQ::Providers::Vmware::InfraManager::EventCatcher +# vmware_refresh_core_: env QUEUE=ems_ ruby lib/workers/bin/run_single_worker.rb MiqEmsRefreshCoreWorker # Logs # diff --git a/config/application.rb b/config/application.rb index 5066c25e2f0..caacdc1dbac 100644 --- a/config/application.rb +++ b/config/application.rb @@ -18,7 +18,7 @@ # This variable should be a comma separated list of groups. # The default BUNDLER_GROUPS below includes all bundler groups not in the Rails.groups. # -ENV['BUNDLER_GROUPS'] ||= "manageiq_default" +ENV['BUNDLER_GROUPS'] ||= "manageiq_default,ui_dependencies" if defined?(Bundler) groups = ENV['BUNDLER_GROUPS'].split(",").collect(&:to_sym) diff --git a/lib/workers/miq_worker_types.rb b/lib/workers/miq_worker_types.rb index 6ee8bdd215d..a43f9838670 100644 --- a/lib/workers/miq_worker_types.rb +++ b/lib/workers/miq_worker_types.rb @@ -2,75 +2,75 @@ # global namespace MIQ_WORKER_TYPES = { - "ManageIQ::Providers::Amazon::CloudManager::EventCatcher" => [:amazon], - "ManageIQ::Providers::Amazon::CloudManager::MetricsCollectorWorker" => [:amazon], - "ManageIQ::Providers::Amazon::CloudManager::RefreshWorker" => [:amazon], - "ManageIQ::Providers::Amazon::NetworkManager::RefreshWorker" => [:amazon], - "ManageIQ::Providers::Amazon::StorageManager::Ebs::RefreshWorker" => [:amazon], - "ManageIQ::Providers::Amazon::StorageManager::S3::RefreshWorker" => [:amazon], - "ManageIQ::Providers::AnsibleTower::AutomationManager::EventCatcher" => [:ansible], - "ManageIQ::Providers::AnsibleTower::AutomationManager::RefreshWorker" => [:ansible], - "ManageIQ::Providers::Azure::CloudManager::EventCatcher" => [:azure], - "ManageIQ::Providers::Azure::CloudManager::MetricsCollectorWorker" => [:azure], - "ManageIQ::Providers::Azure::CloudManager::RefreshWorker" => [:azure], - "ManageIQ::Providers::Azure::NetworkManager::RefreshWorker" => [:azure], - "ManageIQ::Providers::EmbeddedAnsible::AutomationManager::EventCatcher" => [:ansible], - "ManageIQ::Providers::EmbeddedAnsible::AutomationManager::RefreshWorker" => [:ansible], - "ManageIQ::Providers::Foreman::ConfigurationManager::RefreshWorker" => [:foreman], - "ManageIQ::Providers::Foreman::ProvisioningManager::RefreshWorker" => [:foreman], - "ManageIQ::Providers::Google::CloudManager::EventCatcher" => [:google], - "ManageIQ::Providers::Google::CloudManager::MetricsCollectorWorker" => [:google], - "ManageIQ::Providers::Google::CloudManager::RefreshWorker" => [:google], - "ManageIQ::Providers::Google::NetworkManager::RefreshWorker" => [:google], - "ManageIQ::Providers::Hawkular::DatawarehouseManager::EventCatcher" => [:hawkular], - "ManageIQ::Providers::Hawkular::DatawarehouseManager::RefreshWorker" => [:hawkular], - "ManageIQ::Providers::Hawkular::MiddlewareManager::EventCatcher" => [:hawkular], - "ManageIQ::Providers::Hawkular::MiddlewareManager::RefreshWorker" => [:hawkular], - "ManageIQ::Providers::Kubernetes::ContainerManager::EventCatcher" => %i(kubernetes openshift), - "ManageIQ::Providers::Kubernetes::ContainerManager::MetricsCollectorWorker" => %i(kubernetes openshift), - "ManageIQ::Providers::Kubernetes::ContainerManager::RefreshWorker" => %i(kubernetes openshift), - "ManageIQ::Providers::Lenovo::PhysicalInfraManager::EventCatcher" => [:lenovo], - "ManageIQ::Providers::Lenovo::PhysicalInfraManager::RefreshWorker" => [:lenovo], - "ManageIQ::Providers::Microsoft::InfraManager::RefreshWorker" => [:manageiq_default], - "ManageIQ::Providers::Nuage::NetworkManager::RefreshWorker" => [:nuage], - "ManageIQ::Providers::Openshift::ContainerManager::EventCatcher" => %i(kubernetes openshift), - "ManageIQ::Providers::Openshift::ContainerManager::MetricsCollectorWorker" => %i(kubernetes openshift), - "ManageIQ::Providers::Openshift::ContainerManager::RefreshWorker" => %i(kubernetes openshift), - "ManageIQ::Providers::Openstack::CloudManager::EventCatcher" => [:openstack], - "ManageIQ::Providers::Openstack::CloudManager::MetricsCollectorWorker" => [:openstack], - "ManageIQ::Providers::Openstack::CloudManager::RefreshWorker" => [:openstack], - "ManageIQ::Providers::Openstack::InfraManager::EventCatcher" => [:openstack], - "ManageIQ::Providers::Openstack::InfraManager::MetricsCollectorWorker" => [:openstack], - "ManageIQ::Providers::Openstack::InfraManager::RefreshWorker" => [:openstack], - "ManageIQ::Providers::Openstack::NetworkManager::EventCatcher" => [:openstack], - "ManageIQ::Providers::Openstack::NetworkManager::MetricsCollectorWorker" => [:openstack], - "ManageIQ::Providers::Openstack::NetworkManager::RefreshWorker" => [:openstack], - "ManageIQ::Providers::Redhat::InfraManager::EventCatcher" => [:ovirt], - "ManageIQ::Providers::Redhat::InfraManager::MetricsCollectorWorker" => [:ovirt], - "ManageIQ::Providers::Redhat::InfraManager::RefreshWorker" => [:ovirt], - "ManageIQ::Providers::StorageManager::CinderManager::EventCatcher" => [:openstack], - "ManageIQ::Providers::StorageManager::CinderManager::RefreshWorker" => [:openstack], - "ManageIQ::Providers::StorageManager::SwiftManager::RefreshWorker" => [:openstack], - "ManageIQ::Providers::Vmware::CloudManager::EventCatcher" => [:vmware], - "ManageIQ::Providers::Vmware::CloudManager::RefreshWorker" => [:vmware], - "ManageIQ::Providers::Vmware::InfraManager::EventCatcher" => [:vmware], - "ManageIQ::Providers::Vmware::InfraManager::MetricsCollectorWorker" => [:vmware], - "ManageIQ::Providers::Vmware::InfraManager::RefreshWorker" => [:vmware], - "ManageIQ::Providers::Vmware::NetworkManager::RefreshWorker" => [:vmware], - "EmbeddedAnsibleWorker" => [], - "MiqCockpitWsWorker" => [:cockpit], - "MiqEmsMetricsProcessorWorker" => [], - "MiqEmsRefreshCoreWorker" => [], - "MiqEventHandler" => [], - "MiqGenericWorker" => [], - "MiqPriorityWorker" => [], - "MiqReportingWorker" => [], - "MiqScheduleWorker" => [:scheduler], - "MiqSmartProxyWorker" => [:smartstate], - "MiqUiWorker" => %i(ui_dependencies web_server), - "MiqVimBrokerWorker" => [:manageiq_default], - "MiqWebServiceWorker" => %i(automate rest_api ui_dependencies web_server), - "MiqWebsocketWorker" => %i(ui_dependencies web_server web_socket) + "ManageIQ::Providers::Amazon::CloudManager::EventCatcher" => %i(manageiq_default), + "ManageIQ::Providers::Amazon::CloudManager::MetricsCollectorWorker" => %i(manageiq_default), + "ManageIQ::Providers::Amazon::CloudManager::RefreshWorker" => %i(manageiq_default), + "ManageIQ::Providers::Amazon::NetworkManager::RefreshWorker" => %i(manageiq_default), + "ManageIQ::Providers::Amazon::StorageManager::Ebs::RefreshWorker" => %i(manageiq_default), + "ManageIQ::Providers::Amazon::StorageManager::S3::RefreshWorker" => %i(manageiq_default), + "ManageIQ::Providers::AnsibleTower::AutomationManager::EventCatcher" => %i(manageiq_default), + "ManageIQ::Providers::AnsibleTower::AutomationManager::RefreshWorker" => %i(manageiq_default), + "ManageIQ::Providers::Azure::CloudManager::EventCatcher" => %i(manageiq_default), + "ManageIQ::Providers::Azure::CloudManager::MetricsCollectorWorker" => %i(manageiq_default), + "ManageIQ::Providers::Azure::CloudManager::RefreshWorker" => %i(manageiq_default), + "ManageIQ::Providers::Azure::NetworkManager::RefreshWorker" => %i(manageiq_default), + "ManageIQ::Providers::EmbeddedAnsible::AutomationManager::EventCatcher" => %i(manageiq_default), + "ManageIQ::Providers::EmbeddedAnsible::AutomationManager::RefreshWorker" => %i(manageiq_default), + "ManageIQ::Providers::Foreman::ConfigurationManager::RefreshWorker" => %i(manageiq_default), + "ManageIQ::Providers::Foreman::ProvisioningManager::RefreshWorker" => %i(manageiq_default), + "ManageIQ::Providers::Google::CloudManager::EventCatcher" => %i(manageiq_default), + "ManageIQ::Providers::Google::CloudManager::MetricsCollectorWorker" => %i(manageiq_default), + "ManageIQ::Providers::Google::CloudManager::RefreshWorker" => %i(manageiq_default), + "ManageIQ::Providers::Google::NetworkManager::RefreshWorker" => %i(manageiq_default), + "ManageIQ::Providers::Hawkular::DatawarehouseManager::EventCatcher" => %i(manageiq_default), + "ManageIQ::Providers::Hawkular::DatawarehouseManager::RefreshWorker" => %i(manageiq_default), + "ManageIQ::Providers::Hawkular::MiddlewareManager::EventCatcher" => %i(manageiq_default), + "ManageIQ::Providers::Hawkular::MiddlewareManager::RefreshWorker" => %i(manageiq_default), + "ManageIQ::Providers::Kubernetes::ContainerManager::EventCatcher" => %i(manageiq_default), + "ManageIQ::Providers::Kubernetes::ContainerManager::MetricsCollectorWorker" => %i(manageiq_default), + "ManageIQ::Providers::Kubernetes::ContainerManager::RefreshWorker" => %i(manageiq_default), + "ManageIQ::Providers::Lenovo::PhysicalInfraManager::EventCatcher" => %i(manageiq_default), + "ManageIQ::Providers::Lenovo::PhysicalInfraManager::RefreshWorker" => %i(manageiq_default), + "ManageIQ::Providers::Microsoft::InfraManager::RefreshWorker" => %i(manageiq_default), + "ManageIQ::Providers::Nuage::NetworkManager::RefreshWorker" => %i(manageiq_default), + "ManageIQ::Providers::Openshift::ContainerManager::EventCatcher" => %i(manageiq_default), + "ManageIQ::Providers::Openshift::ContainerManager::MetricsCollectorWorker" => %i(manageiq_default), + "ManageIQ::Providers::Openshift::ContainerManager::RefreshWorker" => %i(manageiq_default), + "ManageIQ::Providers::Openstack::CloudManager::EventCatcher" => %i(manageiq_default), + "ManageIQ::Providers::Openstack::CloudManager::MetricsCollectorWorker" => %i(manageiq_default), + "ManageIQ::Providers::Openstack::CloudManager::RefreshWorker" => %i(manageiq_default), + "ManageIQ::Providers::Openstack::InfraManager::EventCatcher" => %i(manageiq_default), + "ManageIQ::Providers::Openstack::InfraManager::MetricsCollectorWorker" => %i(manageiq_default), + "ManageIQ::Providers::Openstack::InfraManager::RefreshWorker" => %i(manageiq_default), + "ManageIQ::Providers::Openstack::NetworkManager::EventCatcher" => %i(manageiq_default), + "ManageIQ::Providers::Openstack::NetworkManager::MetricsCollectorWorker" => %i(manageiq_default), + "ManageIQ::Providers::Openstack::NetworkManager::RefreshWorker" => %i(manageiq_default), + "ManageIQ::Providers::Redhat::InfraManager::EventCatcher" => %i(manageiq_default), + "ManageIQ::Providers::Redhat::InfraManager::MetricsCollectorWorker" => %i(manageiq_default), + "ManageIQ::Providers::Redhat::InfraManager::RefreshWorker" => %i(manageiq_default), + "ManageIQ::Providers::StorageManager::CinderManager::EventCatcher" => %i(manageiq_default), + "ManageIQ::Providers::StorageManager::CinderManager::RefreshWorker" => %i(manageiq_default), + "ManageIQ::Providers::StorageManager::SwiftManager::RefreshWorker" => %i(manageiq_default), + "ManageIQ::Providers::Vmware::CloudManager::EventCatcher" => %i(manageiq_default), + "ManageIQ::Providers::Vmware::CloudManager::RefreshWorker" => %i(manageiq_default), + "ManageIQ::Providers::Vmware::InfraManager::EventCatcher" => %i(manageiq_default), + "ManageIQ::Providers::Vmware::InfraManager::MetricsCollectorWorker" => %i(manageiq_default), + "ManageIQ::Providers::Vmware::InfraManager::RefreshWorker" => %i(manageiq_default), + "ManageIQ::Providers::Vmware::NetworkManager::RefreshWorker" => %i(manageiq_default), + "EmbeddedAnsibleWorker" => %i(manageiq_default), + "MiqCockpitWsWorker" => %i(manageiq_default), + "MiqEmsMetricsProcessorWorker" => %i(manageiq_default), + "MiqEmsRefreshCoreWorker" => %i(manageiq_default), + "MiqEventHandler" => %i(manageiq_default), + "MiqGenericWorker" => %i(manageiq_default), + "MiqPriorityWorker" => %i(manageiq_default), + "MiqReportingWorker" => %i(manageiq_default), + "MiqScheduleWorker" => %i(manageiq_default), + "MiqSmartProxyWorker" => %i(manageiq_default), + "MiqUiWorker" => %i(manageiq_default ui_dependencies), + "MiqVimBrokerWorker" => %i(manageiq_default), + "MiqWebServiceWorker" => %i(manageiq_default), + "MiqWebsocketWorker" => %i(manageiq_default), }.freeze MIQ_WORKER_TYPES_IN_KILL_ORDER = %w(