Revision ffc64d7c image_creator/dialog_wizard.py
| b/image_creator/dialog_wizard.py | ||
|---|---|---|
| 353 | 353 |
|
| 354 | 354 |
out.output() |
| 355 | 355 |
try: |
| 356 |
out.output("Uploading image to pithos:")
|
|
| 356 |
out.output("Uploading image to the cloud:")
|
|
| 357 | 357 |
account = Kamaki.get_account(wizard['Cloud']) |
| 358 | 358 |
assert account, "Cloud: %s is not valid" % wizard['Cloud'] |
| 359 | 359 |
kamaki = Kamaki(account, out) |
| ... | ... | |
| 375 | 375 |
|
| 376 | 376 |
is_public = True if wizard['ImageRegistration'] == "Public" else \ |
| 377 | 377 |
False |
| 378 |
out.output('Registering %s image with cyclades ...' %
|
|
| 378 |
out.output('Registering %s image with the cloud ...' %
|
|
| 379 | 379 |
wizard['ImageRegistration'].lower(), False) |
| 380 | 380 |
result = kamaki.register(wizard['ImageName'], pithos_file, |
| 381 | 381 |
metadata, is_public) |
| ... | ... | |
| 397 | 397 |
out.output() |
| 398 | 398 |
|
| 399 | 399 |
except ClientError as e: |
| 400 |
raise FatalError("Pithos client: %d %s" % (e.status, e.message))
|
|
| 400 |
raise FatalError("Storage service client: %d %s" %
|
|
| 401 |
(e.status, e.message)) |
|
| 401 | 402 |
finally: |
| 402 | 403 |
out.remove(with_progress) |
| 403 | 404 |
|
| 404 |
msg = "The %s image was successfully uploaded to Pithos and registered " \ |
|
| 405 |
"with Cyclades. Would you like to keep a local copy?" \ |
|
| 406 |
% wizard['ImageRegistration'].lower() |
|
| 407 |
if not d.yesno(msg, width=PAGE_WIDTH): |
|
| 405 |
text = "The %s image was successfully uploaded to the storage service " \ |
|
| 406 |
"and registered with the compute service of %s. Would you like " \ |
|
| 407 |
"to keep a local copy?" % \ |
|
| 408 |
(wizard['Cloud'], wizard['ImageRegistration'].lower()) |
|
| 409 |
|
|
| 410 |
if not d.yesno(text, width=PAGE_WIDTH): |
|
| 408 | 411 |
extract_image(session) |
| 409 | 412 |
|
| 410 | 413 |
# vim: set sta sts=4 shiftwidth=4 sw=4 et ai : |
Also available in: Unified diff