X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fopenstack_observer%2Fsteps%2Fsync_controller_images.py;h=17ffe57aef1dceea7eac8a26f50b543b66f0a0f0;hb=50c795217b2327793eff678bb456bacd702c9c5f;hp=008de71f6e9e0319d9115a90652e1a7f500014be;hpb=5e31249544b8bc8a4d84b07d06b816a26a1defb4;p=plstackapi.git

diff --git a/planetstack/openstack_observer/steps/sync_controller_images.py b/planetstack/openstack_observer/steps/sync_controller_images.py
index 008de71..17ffe57 100644
--- a/planetstack/openstack_observer/steps/sync_controller_images.py
+++ b/planetstack/openstack_observer/steps/sync_controller_images.py
@@ -12,7 +12,7 @@ from observer.ansible import *
 logger = Logger(level=logging.INFO)
 
 class SyncControllerImages(OpenStackSyncStep):
-    provides=[ControllerImages]
+    provides=[ControllerImages, Image]
     requested_interval=0
 
     def fetch_pending(self, deleted):
@@ -24,19 +24,17 @@ class SyncControllerImages(OpenStackSyncStep):
 
     def sync_record(self, controller_image):
         logger.info("Working on image %s on controller %s" % (controller_image.image.name, controller_image.controller))
-	image_fields = {'endpoint':controller_image.controller.auth_url,
-			'admin_user':controller_image.controller.admin_user,
-			'admin_password':controller_image.controller.admin_password,
-			'name':controller_image.image.name,
-			'filepath':controller_image.image.path,
-	                'ansible_tag': '%s@%s'%(controller_image.image.name,controller_image.controller.name), # name of ansible playbook
-			}
+        image_fields = {'endpoint':controller_image.controller.auth_url,
+                        'admin_user':controller_image.controller.admin_user,
+                        'admin_password':controller_image.controller.admin_password,
+                        'name':controller_image.image.name,
+                        'filepath':controller_image.image.path,
+                        'ansible_tag': '%s@%s'%(controller_image.image.name,controller_image.controller.name), # name of ansible playbook
+                        }
 
-	res = run_template('sync_controller_images.yaml', image_fields, path='controller_images')
 
-	if (len(res)!=1):
-	    raise Exception('Could not sync image %s'%controller_image.image.name)
-	else:
-	    image_id = res[0]['id'] 
-            controller_image.glance_image_id = image_id
-            controller_image.save()
+        res = run_template('sync_controller_images.yaml', image_fields, path='controller_images', expected_num=1)
+
+        image_id = res[0]['id']
+        controller_image.glance_image_id = image_id
+        controller_image.save()