Merge pull request ManageIQ#14928 from bdunne/apache_load_balancing

Drop support for changing load balancing method
bzwei · May 1, 2017 · 75d8148 · 75d8148
2 parents 8514119 + 844e8f8
commit 75d8148
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 4 deletions.
diff --git a/app/models/miq_ui_worker.rb b/app/models/miq_ui_worker.rb
@@ -17,7 +17,6 @@ class MiqUiWorker < MiqWorker
   REDIRECTS_CONFIG_FILE      = '/etc/httpd/conf.d/manageiq-redirects-ui'
   STARTING_PORT              = 3000
   PROTOCOL                   = 'http'
-  LB_METHOD                  = :busy
   REDIRECTS                  = '/'
   CLUSTER                    = 'evmcluster_ui'
 

diff --git a/app/models/miq_web_service_worker.rb b/app/models/miq_web_service_worker.rb
@@ -7,7 +7,6 @@ class MiqWebServiceWorker < MiqWorker
   REDIRECTS_CONFIG_FILE      = '/etc/httpd/conf.d/manageiq-redirects-ws'
   STARTING_PORT              = 4000
   PROTOCOL                   = 'http'
-  LB_METHOD                  = :busy
   REDIRECTS                  = ['/api']
   CLUSTER                    = 'evmcluster_ws'
 

diff --git a/app/models/miq_websocket_worker.rb b/app/models/miq_websocket_worker.rb
@@ -8,7 +8,6 @@ class MiqWebsocketWorker < MiqWorker
   REDIRECTS_CONFIG_FILE      = '/etc/httpd/conf.d/manageiq-redirects-websocket'
   STARTING_PORT              = 5000
   PROTOCOL                   = 'ws'
-  LB_METHOD                  = :busy
   REDIRECTS                  = '/ws'
   CLUSTER                    = 'evmcluster_websocket'
 

diff --git a/app/models/mixins/miq_web_server_worker_mixin.rb b/app/models/mixins/miq_web_server_worker_mixin.rb
@@ -104,7 +104,6 @@ def install_apache_proxy_config
       options = {
         :member_file    => self::BALANCE_MEMBER_CONFIG_FILE,
         :redirects_file => self::REDIRECTS_CONFIG_FILE,
-        :lbmethod       => self::LB_METHOD,
         :redirects      => self::REDIRECTS,
         :cluster        => self::CLUSTER,
         :protocol       => self::PROTOCOL