diff --git a/neutron/agent/l3/ha_router.py b/neutron/agent/l3/ha_router.py index b1839913e09..c1294bb6aef 100644 --- a/neutron/agent/l3/ha_router.py +++ b/neutron/agent/l3/ha_router.py @@ -362,6 +362,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, @@ -374,8 +375,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