From f91838277dab716effa5a4fe8c46571076c7474f Mon Sep 17 00:00:00 2001 From: Nick Carboni Date: Tue, 14 Mar 2017 09:23:01 -0400 Subject: [PATCH] Merge pull request #14311 from jrafanie/add_balancer_members_after_all_configs_written Add balancer members after configs have been written (cherry picked from commit 5b167ab4748c17ff5c937bb2eba1aaa37fdba8c7) https://bugzilla.redhat.com/show_bug.cgi?id=1432463 --- app/models/miq_server/environment_management.rb | 9 +++++++++ app/models/mixins/miq_web_server_worker_mixin.rb | 1 - 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/models/miq_server/environment_management.rb b/app/models/miq_server/environment_management.rb index 023313cef9c..c02eb3edd77 100644 --- 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 index 4904d870b44..860e75a9967 100644 --- 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