[modules] remove unnecessary line (closes #219043)
authorPaul Tonelli <paul.tonelli@logilab.fr>
Tue, 26 Nov 2013 17:33:34 +0100
changeset 188 9cb7830868c2
parent 187 e115bc7c3d86
child 189 67a5184399e7
[modules] remove unnecessary line (closes #219043)
_modules/openstack_client.py
--- a/_modules/openstack_client.py	Tue Nov 26 13:57:06 2013 +0100
+++ b/_modules/openstack_client.py	Tue Nov 26 17:33:34 2013 +0100
@@ -85,9 +85,7 @@
     ok_for_image = True
     for o_type in object_types:
         object_id[o_type] = __salt__['grains.get'](o_type + '_id')
-        if object_id[o_type]:
-            object_id[o_type] = object_id[o_type]
-        else:
+        if not object_id[o_type]:
             o_path = _find_objects(path, o_type)
             if len(o_path) == 1:
                 object_id[o_type] = __salt__['openstack_client.upload_file'](