commit ce12eced7bc98abdfa7d26263d070ddc2bb8d5c0
author Sapan Bhatia <gwsapan@gmail.com> Wed Oct 14 19:41:13 2015 +0200
committer Sapan Bhatia <gwsapan@gmail.com> Wed Oct 14 19:41:13 2015 +0200
tree 5132f57d01f903bd6fd7123b6862954014516dc2
parent 57f16923124ce68d51271014d42d309b158dcdf1
parent 5fdc41eb24034039cd514de49ae6c46833a9128f

Merge branch 'master' of github.com:open-cloud/xos

xos/openstack_observer/steps/sync_instances.py

diff --git a/xos/openstack_observer/steps/sync_instances.py b/xos/openstack_observer/steps/sync_instances.py
index 4ac1870..1209448 100644
--- a/xos/openstack_observer/steps/sync_instances.py
+++ b/xos/openstack_observer/steps/sync_instances.py
@@ -56,10 +56,12 @@
                                                                 controller=instance.node.site_deployment.controller)
 
         for controller_network in controller_networks:
+
+            # Lenient exception - causes slow backoff
             if controller_network.network.template.visibility == 'private' and \
                controller_network.network.template.translation == 'none':
                    if not controller_network.net_id:
-                        raise Exception("Private Network %s has no id; Try again later" % controller_network.network.name)
+                        raise DeferredException("Private Network %s has no id; Try again later" % controller_network.network.name)
                    nics.append(controller_network.net_id)
 
         # now include network template