Don't pass None arg to neutron-keepalived-state-change
The original fix for bug 1818614 added two new cli args
when spawning neutron-keepalived-state-change but if
e.g. self.agent_conf.AGENT.root_helper_daemon is unset
then "None" string is passed which breaks the
neutron-keepalived-state-change daemon.
Change-Id: I4afcdbbf2f3d2dafcad241ba3fc0778b52b8fc85
Related-Bug: #1818614
Related-Bug: #1823038
(cherry picked from commit afbbec83a2578aac6aa0f16c205c5da3a788969b)
(cherry picked from commit a7df1c458c1fcfee03abfff7e2dd5994eca3f91e)
(cherry picked from commit 279c99ab7d69e236afe7f6cbc91b7a0586a40edd)
(cherry picked from commit 21387750a9f424ef3275c2076f2152749dc5bb87)
Reviewed: https:/ /review. openstack. org/650970 /git.openstack. org/cgit/ openstack/ neutron/ commit/ ?id=7047f0c2930 3ac32f23c520a51 4c4b11520c8a69
Committed: https:/
Submitter: Zuul
Branch: stable/ocata
commit 7047f0c29303ac3 2f23c520a514c4b 11520c8a69
Author: Edward Hope-Morley <email address hidden>
Date: Thu Apr 4 14:22:54 2019 +0100
Don't pass None arg to neutron- keepalived- state-change
The original fix for bug 1818614 added two new cli args keepalived- state-change but if conf.AGENT. root_helper_ daemon is unset keepalived- state-change daemon.
when spawning neutron-
e.g. self.agent_
then "None" string is passed which breaks the
neutron-
Change-Id: I4afcdbbf2f3d2d afcad241ba3fc07 78b52b8fc85 c6aa0f16c205c5d a3a788969b) e03abfff7e2dd59 94eca3f91e) 6afe7f6cbc91b7a 0586a40edd) f3275c2076f2152 749dc5bb87)
Related-Bug: #1818614
Related-Bug: #1823038
(cherry picked from commit afbbec83a2578aa
(cherry picked from commit a7df1c458c1fcfe
(cherry picked from commit 279c99ab7d69e23
(cherry picked from commit 21387750a9f424e