From cd3f4f7d24c92475ca698906c57f60375861b83f Mon Sep 17 00:00:00 2001 From: Jakub Libosvar Date: Tue, 29 Jul 2014 12:18:33 +0200 Subject: [PATCH] Fix deprecated opt in haproxy driver If Neutron was updated from Havana, lbaas config file defines user_group and loadbalancer_state_path in default section but since Icehouse these settings were moved to haproxy section. This patch adds DEFAULT group to DeprecatedOpt. Change-Id: Ic92d4bc81ff6a3b16799414d17ac52e7a4801796 Closes-bug: #1349767 --- .../loadbalancer/drivers/haproxy/namespace_driver.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py b/neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py index 967c65e7f..e259dbf7f 100644 --- a/neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py +++ b/neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py @@ -44,13 +44,14 @@ OPTS = [ 'loadbalancer_state_path', default=STATE_PATH_DEFAULT, help=_('Location to store config and state files'), - deprecated_opts=[cfg.DeprecatedOpt('loadbalancer_state_path')], + deprecated_opts=[cfg.DeprecatedOpt('loadbalancer_state_path', + group='DEFAULT')], ), cfg.StrOpt( 'user_group', default=USER_GROUP_DEFAULT, help=_('The user group'), - deprecated_opts=[cfg.DeprecatedOpt('user_group')], + deprecated_opts=[cfg.DeprecatedOpt('user_group', group='DEFAULT')], ), cfg.IntOpt( 'send_gratuitous_arp', -- 2.45.2