From 5459f795716aeb8393315a773623e8b6d7568d32 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 24 Jul 2024 19:32:27 +0900 Subject: [PATCH] Drop remaining usage of CONFIG_HORIZON_NEUTRON_LB This option is no longer used since Neutron LBaaS was retired. Change-Id: I10bcad01ba1add61599e7f4759242c36b97dc927 --- packstack/plugins/dashboard_500.py | 1 - packstack/puppet/modules/packstack/manifests/horizon.pp | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/packstack/plugins/dashboard_500.py b/packstack/plugins/dashboard_500.py index ce866b817..0fce7496a 100644 --- a/packstack/plugins/dashboard_500.py +++ b/packstack/plugins/dashboard_500.py @@ -192,7 +192,6 @@ def create_manifest(config, messages): "/etc/httpd/conf.d/ssl.conf on %s to use a CA signed cert." % (utils.COLORS['red'], utils.COLORS['nocolor'], horizon_host)) - config["CONFIG_HORIZON_NEUTRON_LB"] = False config["CONFIG_HORIZON_NEUTRON_VPN"] = False if config['CONFIG_NEUTRON_INSTALL'] == 'y': diff --git a/packstack/puppet/modules/packstack/manifests/horizon.pp b/packstack/puppet/modules/packstack/manifests/horizon.pp index a58c033c6..eda6dc2e8 100644 --- a/packstack/puppet/modules/packstack/manifests/horizon.pp +++ b/packstack/puppet/modules/packstack/manifests/horizon.pp @@ -35,8 +35,7 @@ class packstack::horizon () ssl_ca => lookup('CONFIG_HORIZON_SSL_CACERT', undef, undef, undef), ssl_verify_client => 'optional', neutron_options => { - 'enable_vpn' => lookup('CONFIG_HORIZON_NEUTRON_VPN'), - 'enable_lb' => lookup('CONFIG_HORIZON_NEUTRON_LB'), + 'enable_vpn' => lookup('CONFIG_HORIZON_NEUTRON_VPN'), }, }