Use user id to authenticate with synnefo

Latest versions of synnefo require user id instead of e-mail to
authenticate.

diff --git a/docs/usage.rst b/docs/usage.rst
index 2b6971b..40e8607 100644 (file)
--- a/docs/usage.rst
+++ b/docs/usage.rst
@@ -175,7 +175,7 @@ following basic information:
  * Name: A short name for the image (ex. "Slackware")
  * Description: An one-line description for the image
    (ex. "Slackware Linux 14.0 with KDE")
  * Name: A short name for the image (ex. "Slackware")
  * Description: An one-line description for the image
    (ex. "Slackware Linux 14.0 with KDE")

- * Account: An *~okeanos* account email
+ * Account: An *~okeanos* account user id

  * Token: A token corresponding to the account given above
 
 After confirming, the image will be extracted, uploaded to *pithos+* and
  * Token: A token corresponding to the account given above
 
 After confirming, the image will be extracted, uploaded to *pithos+* and

diff --git a/image_creator/dialog_menu.py b/image_creator/dialog_menu.py
index 0324825..5f4f0ef 100644 (file)
--- a/image_creator/dialog_menu.py
+++ b/image_creator/dialog_menu.py
@@ -266,7 +266,7 @@ def kamaki_menu(session):
         token = session["token"] if "token" in session else "<none>"
         upload = session["upload"] if "upload" in session else "<none>"
 
         token = session["token"] if "token" in session else "<none>"
         upload = session["upload"] if "upload" in session else "<none>"
 

-        choices = [("Account", "Change your ~okeanos username: %s" % account),
+        choices = [("Account", "Change your ~okeanos user id: %s" % account),

                    ("Token", "Change your ~okeanos token: %s" % token),
                    ("Upload", "Upload image to pithos+"),
                    ("Register", "Register the image to cyclades: %s" % upload)]
                    ("Token", "Change your ~okeanos token: %s" % token),
                    ("Upload", "Upload image to pithos+"),
                    ("Register", "Register the image to cyclades: %s" % upload)]

@@ -283,7 +283,7 @@ def kamaki_menu(session):
         if choice == "Account":
             default_item = "Account"
             (code, answer) = d.inputbox(
         if choice == "Account":
             default_item = "Account"
             (code, answer) = d.inputbox(

-                "Please provide your ~okeanos account e-mail address:",
+                "Please provide your ~okeanos account user id:",

                 init=session["account"] if "account" in session else '',
                 width=WIDTH)
             if code in (d.DIALOG_CANCEL, d.DIALOG_ESC):
                 init=session["account"] if "account" in session else '',
                 width=WIDTH)
             if code in (d.DIALOG_CANCEL, d.DIALOG_ESC):

diff --git a/image_creator/dialog_wizard.py b/image_creator/dialog_wizard.py
index 66f6bbf..0735042 100644 (file)
--- a/image_creator/dialog_wizard.py
+++ b/image_creator/dialog_wizard.py
@@ -191,7 +191,7 @@ def wizard(session):
                             init=session['metadata']['DESCRIPTION'] if
                             'DESCRIPTION' in session['metadata'] else '')
     account = WizardInputPage("account",
                             init=session['metadata']['DESCRIPTION'] if
                             'DESCRIPTION' in session['metadata'] else '')
     account = WizardInputPage("account",

-                              "Please provide your ~okeanos account e-mail:",
+                              "Please provide your ~okeanos account user id:",

                               title="~okeanos account information",
                               init=init_account)
     token = WizardInputPage("token",
                               title="~okeanos account information",
                               init=init_account)
     token = WizardInputPage("token",