Merge pull request #14311 from jrafanie/add_balancer_members_after_al…

…l_configs_written Add balancer members after configs have been written (cherry picked from commit 5b167ab) https://bugzilla.redhat.com/show_bug.cgi?id=1432463
ManageIQ · Mar 15, 2017 · f918382 · f918382
1 parent 44c8abf
commit f918382
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/app/models/miq_server/environment_management.rb b/app/models/miq_server/environment_management.rb
@@ -88,6 +88,15 @@ def prep_apache_proxying
       MiqUiWorker.install_apache_proxy_config
       MiqWebServiceWorker.install_apache_proxy_config
       MiqWebsocketWorker.install_apache_proxy_config
+
+      # Because adding balancer members does a validation of the configuration
+      # files and these files try to load the redirect files among others,
+      # we need to add the balancers members after all configuration files have
+      # been written by install_apache_proxy_config.
+      MiqUiWorker.add_apache_balancer_members
+      MiqWebServiceWorker.add_apache_balancer_members
+      MiqWebsocketWorker.add_apache_balancer_members
+
       MiqApache::Control.restart
     end
   end

diff --git a/app/models/mixins/miq_web_server_worker_mixin.rb b/app/models/mixins/miq_web_server_worker_mixin.rb
@@ -112,7 +112,6 @@ def install_apache_proxy_config
 
       _log.info("[#{options.inspect}")
       MiqApache::Conf.install_default_config(options)
-      add_apache_balancer_members
     end
 
     def port_range