Revision 09743d3a

b/image_creator/dialog_main.py
316 316
        return False
317 317

  
318 318
    if "upload" not in session:
319
        d.msgbox("You need to have an image uploaded to pithos+ before you "
320
                 "can register it to cyclades",
321
                 width=MSGBOX_WIDTH)
319
        d.msgbox("You need to upload the image to pithos+ before you can "
320
                 "register it to cyclades", width=MSGBOX_WIDTH)
322 321
        return False
323 322

  
324 323
    while 1:
......
362 361
        choices = [("Account", "Change your ~okeanos username: %s" % account),
363 362
                   ("Token", "Change your ~okeanos token: %s" % token),
364 363
                   ("Upload", "Upload image to pithos+"),
365
                   ("Register", "Register image to cyclades: %s" % upload)]
364
                   ("Register", "Register the image to cyclades: %s" % upload)]
366 365

  
367 366
        (code, choice) = d.menu(
368 367
            text="Choose one of the following or press <Back> to go back.",
......
480 479
        # ADD button
481 480
        elif code == d.DIALOG_EXTRA:
482 481
            add_property(session)
482
        elif code == 'help':
483
            help_file = get_help_file("image_properties")
484
            assert os.path.exists(help_file)
485
            d.textbox(help_file, title="Image Properties", width=70, height=40)
483 486

  
484 487

  
485 488
def delete_properties(session):
b/image_creator/help/image_properties.rst
1
Image properties with special meaning
2
=====================================
3

  
4
Properties used during image deployment
5
---------------------------------------
6
 - OSFAMILY={linux, windows}
7
     This specifies whether this is a Linux or a Windows image.
8
 - ROOT_PARTITION=n
9
     The partition number of the root partition.
10
 - USERS="username1 username2..."
11
     This is a space-seperated list of users, whose password will
12
     be reset during deployment.
13
 - SWAP=<n>:<size>
14
     If this property is present, cyclades will create a swap
15
     partition with given size at the end of the instance's disk.
16
     This property only makes sense for Linux images.
17

  
18
Properties used by the ~okeanos User Interface
19
----------------------------------------------
20
 - OS
21
     The value of this property is used to associate the image
22
     with an Operating System Logo.
23
 - DESCRIPTION
24
     A short description about the image.
25
 - SIZE
26
     This is used by the UI to compute the image copy progress
27
     during deployment.
28
 - GUI
29
     Short description about the Graphical User Interface the
30
     image hosts.
31
 - KERNEL
32
     The kernel version of the image OS.

Also available in: Unified diff