X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fopenstack_observer%2Fsteps%2Fsync_controller_images.py;h=fa0cad1770d577518d37b7c348dd90e96100b95c;hb=267606314830fbc5deb9e28dc0d47e8cbf8d68b1;hp=0a0910e581c112dcf45a3d6113b7abf63577c817;hpb=d0c0b31bcf0dd8976f67643749f50d1871c12c17;p=plstackapi.git diff --git a/planetstack/openstack_observer/steps/sync_controller_images.py b/planetstack/openstack_observer/steps/sync_controller_images.py index 0a0910e..fa0cad1 100644 --- a/planetstack/openstack_observer/steps/sync_controller_images.py +++ b/planetstack/openstack_observer/steps/sync_controller_images.py @@ -24,22 +24,18 @@ 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)) - import pdb - pdb.set_trace() + 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') + res = run_template('sync_controller_images.yaml', image_fields, path='controller_images', expected_num=1) - 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() + image_id = res[0]['id'] + controller_image.glance_image_id = image_id + controller_image.backend_status = '1 - OK' + controller_image.save()