Revision 358a19bc ci/snf-ci

b/ci/snf-ci
55 55
    parser.add_option("--cloud", dest="kamaki_cloud", default=None,
56 56
                      help="Use specified cloud, as is in .kamakirc")
57 57
    parser.add_option("-f", "--flavor", dest="flavor", default=None,
58
                      help="Name of flavor to use for the server.")
58
                      help="Flavor to use for the server."
59
                           " Supports both search by name (reg expression)"
60
                           " with \"name:flavor name\" or by id with"
61
                           " \"id:flavor id\".")
59 62
    parser.add_option("-i", "--image", dest="image", default=None,
60
                      help="UUID of image to use for the server.")
63
                      help="Image to use for the server."
64
                           " Supports both search by name (reg expression)"
65
                           " with \"name:image name\" or by id with"
66
                           " \"id:image id\".")
61 67
    parser.add_option("--ssh-keys", dest="ssh_keys", default=None,
62 68
                      help="Upload/Install the public ssh keys contained"
63 69
                           " in this file to the server")
......
112 118
                           cloud=options.kamaki_cloud)
113 119

  
114 120
    if getattr(options, CREATE_SERVER_CMD, False):
115
        synnefo_ci.create_server(flavor_name=options.flavor,
116
                                 image_id=options.image,
121
        synnefo_ci.create_server(flavor=options.flavor,
122
                                 image=options.image,
117 123
                                 ssh_keys=options.ssh_keys)
118 124
        synnefo_ci.clone_repo(local_repo=options.local_repo)
119 125
    if getattr(options, BUILD_SYNNEFO_CMD, False):

Also available in: Unified diff