openstack
/
neutron-fwaas
Code Issues Proposed changes

Merge "Fix deprecated opt in haproxy driver" into stable/icehouse

This commit is contained in:
Jenkins 2014-08-02 22:19:39 +00:00 committed by Gerrit Code Review
parent 47170d5af4 c19633d4a3
commit 10cfc6b947
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')