Merge "Don't pass None arg to neutron-keepalived-state-change"
This commit is contained in:
commit
1f6c48b1f2
|
@ -364,6 +364,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,
|
||||
|
@ -376,8 +377,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
|
||||
|
|
Loading…
Reference in New Issue