openstack
/
neutron
Code Issues Proposed changes

Merge "Don't pass None arg to neutron-keepalived-state-change" into stable/pike

This commit is contained in:
Zuul 2019-04-09 13:53:40 +00:00 committed by Gerrit Code Review
parent ec122c019f 36a1e193cb
commit 7ba0d8fb49
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -360,6 +360,7 @@ 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,
@ -372,8 +373,7 @@ class HaRouter(router.RouterInfo):
'--user=%s' % os.geteuid(),
'--group=%s' % os.getegid(),
'--AGENT-root_helper=%s' % self.agent_conf.AGENT.root_helper,
'--AGENT-root_helper_daemon=%s' %
self.agent_conf.AGENT.root_helper_daemon]
'--AGENT-root_helper_daemon=%s' % root_helper_daemon]
return cmd
return callback