--- a/components/openstack/neutron/patches/02-l3-agent-add-solaris.patch	Tue Aug 23 18:19:17 2016 -0700
+++ b/components/openstack/neutron/patches/02-l3-agent-add-solaris.patch	Wed Aug 24 11:32:05 2016 -0700
@@ -99,3 +99,18 @@
       server = neutron_service.Service.create(
           binary='neutron-l3-agent',
           topic=topics.L3_AGENT,
+--- neutron-2015.1.2/neutron/agent/l3/agent.py.~1~	2015-10-13 10:35:16.000000000 -0700
++++ neutron-2015.1.2/neutron/agent/l3/agent.py	2016-08-19 20:29:49.000000000 -0700
+@@ -523,6 +523,12 @@
+             else:
+                 routers = self.plugin_rpc.get_routers(context,
+                                                       [self.conf.router_id])
++                if not routers:
++                    LOG.error(_LE('Server failed to return info for router '
++                                  'with id: %s. Make sure the correct '
++                                  'router_id is specified in l3_agent.ini'),
++                              self.conf.router_id)
++                    raise SystemExit(1)
+ 
+         except oslo_messaging.MessagingException:
+             LOG.exception(_LE("Failed synchronizing routers due to RPC error"))