commit 818c7bdfc6ee69a358e012a74be911ec65fc61f2
author Scott Baker <smbaker@gmail.com> Wed Jun 13 16:28:01 2018 -0700
committer Scott Baker <smbaker@gmail.com> Fri Jun 15 08:33:46 2018 -0700
tree 3f73dc92e78b2b278e42c1a304672acb71efeabd
parent af4ba42ddcab8ac1a2ac804b36556e6304d7c95e

CORD-3148 Allow OpenStackServiceInstance not attached to a node

Change-Id: I0c6b0bdc15b775e6bff959a18f1e4731578a5da4

xos/synchronizer/steps/sync_openstackserviceinstance.py

diff --git a/xos/synchronizer/steps/sync_openstackserviceinstance.py b/xos/synchronizer/steps/sync_openstackserviceinstance.py
index 9db35de..5e0b058 100644
--- a/xos/synchronizer/steps/sync_openstackserviceinstance.py
+++ b/xos/synchronizer/steps/sync_openstackserviceinstance.py
@@ -89,9 +89,9 @@
             # TODO(smbaker): No ssh keys specified
 
             if not instance.node:
-                raise Exception("No node specified for instance")
-
-            availability_zone="nova:%s" % instance.node.name
+                availability_zone = "nova"
+            else:
+                availability_zone="nova:%s" % instance.node.name
 
             log.info("Creating Instance", instance=instance, image_id=image_id, flavor_id=flavor_id,
                      availability_zone=availability_zone,