Merge "Enable automatic failover of l3 routers"

elements/neutron-network-node/element-deps

@@ -2,4 +2,5 @@ neutron
 neutron-dhcp-agent
 neutron-openvswitch-agent
 os-refresh-config
+pacemaker
 pkg-map

elements/neutron-network-node/os-refresh-config/post-configure.d/80-neutron-networking

@@ -1,8 +1,17 @@
 #!/bin/bash
 set -eux
 
-os-svc-enable -n neutron-metadata-agent
-os-svc-enable -n neutron-l3-agent
-
 os-svc-restart -n neutron-metadata-agent
 os-svc-restart -n neutron-l3-agent
+
+# this ensures that neutron-l3-agent and neutron-metadata-agent services
+# will be monitored by pacemaker on all nodes.
+# Because allow_automatic_l3agent_failover is enabled, we want
+# to make sure that if l3-agent service fails it's started again by
+# pacemaker. If outage is longer and l3 routers are moved to other
+# node meantime, l3-agent will clean up routers on local node when
+# started again.
+# TODO: it would be cleaner to do service restart above by pacemaker
+# command, but it's difficult to restart service on single node only
+pcmk-service-create -c -n neutron-metadata-agent
+pcmk-service-create -c -n neutron-l3-agent

elements/neutron/os-apply-config/etc/neutron/neutron.conf

@@ -3,7 +3,6 @@
 ## It has been enabled for passthrough configuration support.
 
 [DEFAULT]
-
 {{#neutron.verbose}}
 # Print more verbose output (set logging level to INFO instead
 # of default WARNING level). (boolean value)
@@ -15,6 +14,8 @@ verbose={{neutron.verbose}}
 debug={{neutron.debug}}
 {{/neutron.debug}}
 
+allow_automatic_l3agent_failover = True
+
 lock_path = /var/run/neutron/lock
 
 auth_strategy = keystone