Merge pull request #2335 from Shrews/os_router

Fix for routers without external interfaces

cloud/openstack/os_router.py

@@ -164,10 +164,13 @@ def _needs_update(cloud, module, router, network, internal_subnet_ids):
     """
     if router['admin_state_up'] != module.params['admin_state_up']:
         return True
-    if router['external_gateway_info'].get('enable_snat', True) != module.params['enable_snat']:
+    if router['external_gateway_info']:
-        return True
+        if router['external_gateway_info'].get('enable_snat', True) != module.params['enable_snat']:
+            return True
     if network:
-        if router['external_gateway_info']['network_id'] != network['id']:
+        if not router['external_gateway_info']:
+            return True
+        elif router['external_gateway_info']['network_id'] != network['id']:
             return True
 
     # check external interfaces