openstack
/
neutron
Code Issues Proposed changes

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.

Conflicts:
	neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py

Change-Id: Ic92d4bc81ff6a3b16799414d17ac52e7a4801796
Closes-bug: #1349767
(cherry picked from commit cd3f4f7d24)
This commit is contained in:
Jakub Libosvar 2014-07-29 12:18:33 +02:00
parent 7564c4b9da
commit c19633d4a3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py
View File

@ -46,13 +46,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.CONF.register_opts(OPTS, 'haproxy')