Merge "Remove rootwrap configuration from neutron-keepalived-state-change" into stable/stein
This commit is contained in:
commit
0efac45f2c
|
@ -364,7 +364,6 @@ class HaRouter(router.RouterInfo):
|
|||
ha_cidr = self._get_primary_vip()
|
||||
|
||||
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,
|
||||
|
@ -375,9 +374,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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -96,11 +96,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
|
||||
|
||||
|
|
Loading…
Reference in New Issue