openstack
/
neutron
Code Issues Proposed changes

Remove rootwrap configuration from neutron-keepalived-state-change 

New IP command introduced by Ie3fe825d65408fc969c478767b411fe0156e9fbc
requires only privsep initialization. This patch removes the prisep
error FailedToDropPrivileges when executed under neutron-rootwrap.

Closes-Bug: #1823038

Change-Id: I6cde3c9dae7ffdccce49e88c3c79d1c379f291cf
This commit is contained in:
Rodolfo Alonso Hernandez 2019-05-10 10:58:08 +00:00
parent d0e64c6183
commit aacd11ab9f
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
neutron/agent/l3/ha_router.py
View File

@ -367,7 +367,6 @@ class HaRouter(router.RouterInfo):
"%s/neutron-keepalived-state-change.log") % config_dir
def callback(pid_file):
root_helper_daemon = self.agent_conf.AGENT.root_helper_daemon or ''
cmd = [
'neutron-keepalived-state-change',
'--router_id=%s' % self.router_id,
@ -379,9 +378,7 @@ class HaRouter(router.RouterInfo):
'--pid_file=%s' % pid_file,
'--state_path=%s' % self.agent_conf.state_path,
'--user=%s' % os.geteuid(),
'--group=%s' % os.getegid(),
'--AGENT-root_helper=%s' % self.agent_conf.AGENT.root_helper,
'--AGENT-root_helper_daemon=%s' % root_helper_daemon]
'--group=%s' % os.getegid()]
return cmd
return callback

2
neutron/agent/l3/keepalived_state_change.py
View File

@ -163,8 +163,6 @@ def configure(conf):
def main():
agent_config.register_root_helper(cfg.CONF)
cfg.CONF.register_cli_opts(agent_config.ROOT_HELPER_OPTS, 'AGENT')
keepalived.register_cli_l3_agent_keepalived_opts()
keepalived.register_l3_agent_keepalived_opts()
configure(cfg.CONF)

5
neutron/tests/functional/agent/l3/framework.py
View File

@ -95,11 +95,6 @@ class L3AgentTestFramework(base.BaseSudoTestCase):
get_temp_file_path('external/pids'))
conf.set_override('host', host)
conf.set_override('agent_mode', agent_mode)
conf.set_override(
'root_helper', cfg.CONF.AGENT.root_helper, group='AGENT')
conf.set_override(
'root_helper_daemon', cfg.CONF.AGENT.root_helper_daemon,
group='AGENT')
return conf