L3 agent cleanup_on_shutdown

Once we do not kill keepalived for l3 agent, it might be usefull to
override that. This is possible with neutron_l3_cleanup_on_shutdown
When it set to True, keepalived will be restarted by l3 agent
except first service restart, where it wil be killed by handler,
since config should be loaded first.

Change-Id: I9eea72d68398f9fd272b1e9ae0c0c0198336c2f5

defaults/main.yml

@@ -401,6 +401,8 @@ neutron_keepalived_no_track: "{{ _neutron_keepalived_no_track | default(True) }}
 neutron_ha_vrrp_auth_type: PASS
 neutron_l3_ha_net_cidr: 169.254.192.0/18
 
+neutron_l3_cleanup_on_shutdown: False
+
 ###
 ### DHCP Agent Plugin Configuration
 ###

handlers/main.yml

@@ -59,7 +59,7 @@
   shell: |
     for ns_pid in $(cat /sys/fs/cgroup/pids/neutron.slice/neutron-l3-agent.service/cgroup.procs); do
       echo $(readlink -f "/proc/$ns_pid/exe") | grep -qv "keepalived"
-      if [ $? -eq 0 ]; then
+      if [ $? -eq 0 ] || [ "{{ neutron_l3_cleanup_on_shutdown | bool }}" = "True" ]; then
         if kill -9 "$ns_pid"; then
           logger -s "old neutron-l3-agent pid found and has been cleaned up on: \"$ns_pid\""
         fi

templates/l3_agent.ini.j2

@@ -18,6 +18,8 @@ ha_vrrp_advert_int = 2
 ha_vrrp_auth_password = {{ neutron_ha_vrrp_auth_password }}
 ha_vrrp_auth_type = {{ neutron_ha_vrrp_auth_type }}
 
+cleanup_on_shutdown = {{ neutron_l3_cleanup_on_shutdown }}
+
 # Metadata
 enable_metadata_proxy = True