Browse Source

Merge "Add rootwrap filters to kill state change monitor"

Zuul 1 month ago
parent
commit
bcc2f87d3f
1 changed files with 12 additions and 1 deletions
  1. 12
    1
      etc/neutron/rootwrap.d/l3.filters

+ 12
- 1
etc/neutron/rootwrap.d/l3.filters View File

@@ -51,10 +51,21 @@ ip6tables-restore: CommandFilter, ip6tables-restore, root
51 51
 
52 52
 # Keepalived
53 53
 keepalived: CommandFilter, keepalived, root
54
-kill_keepalived: KillFilter, root, /usr/sbin/keepalived, -HUP, -15, -9
54
+kill_keepalived: KillFilter, root, keepalived, -HUP, -15, -9
55 55
 
56 56
 # l3 agent to delete floatingip's conntrack state
57 57
 conntrack: CommandFilter, conntrack, root
58 58
 
59 59
 # keepalived state change monitor
60 60
 keepalived_state_change: CommandFilter, neutron-keepalived-state-change, root
61
+# The following filters are used to kill the keepalived state change monitor.
62
+# Since the monitor runs as a Python script, the system reports that the
63
+# command of the process to be killed is python.
64
+# TODO(mlavalle) These kill filters will be updated once we come up with a
65
+# mechanism to kill using the name of the script being executed by Python
66
+kill_keepalived_monitor_py: KillFilter, root, python, -15
67
+kill_keepalived_monitor_py27: KillFilter, root, python2.7, -15
68
+kill_keepalived_monitor_py3: KillFilter, root, python3, -15
69
+kill_keepalived_monitor_py35: KillFilter, root, python3.5, -15
70
+kill_keepalived_monitor_py36: KillFilter, root, python3.6, -15
71
+kill_keepalived_monitor_py37: KillFilter, root, python3.7, -15

Loading…
Cancel
Save