change naming convention for kernel and ramdisk: put image name first and type at the end
authorPaul Tonelli <paul.tonelli@logilab.fr>
Fri, 19 Apr 2013 13:58:41 +0200
changeset 124 bba5d6e1d088
parent 123 781848b55b43
child 125 3c64efeb3ee4
change naming convention for kernel and ramdisk: put image name first and type at the end
_modules/vm_create.py
--- a/_modules/vm_create.py	Fri Apr 19 11:10:50 2013 +0200
+++ b/_modules/vm_create.py	Fri Apr 19 13:58:41 2013 +0200
@@ -61,7 +61,8 @@
             o_path = _find_objects(path, o_type)
             if len(o_path) == 1:
                 object_id[o_type] = __salt__['openstack_client.upload_to_glance'](
-                        o_path[0], object_types[o_type], image_name=o_type + '_' + ami_name)
+                        o_path[0], object_types[o_type], image_name= ami_name +
+                        '-' + o_type)
             else:
                 log.error('no ' + o_type + ' found in ' + path)
                 ok_for_image = False