commit 7f252d043de60a32af39d9937002c6dcd76099eb
author Andy Bavier <acb@cs.princeton.edu> Fri Apr 17 14:41:56 2015 -0400
committer Andy Bavier <acb@cs.princeton.edu> Fri Apr 17 14:41:56 2015 -0400
tree 2c07ef0595265e76ed8585270da1ab0e438ad67c
parent 86492f5adf36b452b52c75d7362e07e6af56f6b9
parent a4025e9311559333e31567d3d23db76defe8c020

Merge branch 'fixes'

xos/openstack_observer/steps/sync_slivers.py

diff --git a/xos/openstack_observer/steps/sync_slivers.py b/xos/openstack_observer/steps/sync_slivers.py
index a1ea203..de17791 100644
--- a/xos/openstack_observer/steps/sync_slivers.py
+++ b/xos/openstack_observer/steps/sync_slivers.py
@@ -117,12 +117,12 @@
                      'meta':metadata_update,
                      'user_data':r'%s'%escape(userData)}
 
-        res = run_template('sync_slivers.yaml', tenant_fields,path='slivers', expected_num=2)
-        sliver_id = res[1]['info']['OS-EXT-SRV-ATTR:instance_name'] # 0 is for the key
-        sliver_uuid = res[1]['id'] # 0 is for the key
+        res = run_template('sync_slivers.yaml', tenant_fields,path='slivers', expected_num=1)
+        sliver_id = res[0]['info']['OS-EXT-SRV-ATTR:instance_name']
+        sliver_uuid = res[0]['id']
 
         try:
-            hostname = res[1]['info']['OS-EXT-SRV-ATTR:hypervisor_hostname']
+            hostname = res[0]['info']['OS-EXT-SRV-ATTR:hypervisor_hostname']
             ip = socket.gethostbyname(hostname)
             sliver.ip = ip
         except: