usage = "Usage: %prog [options] <input_media>"
parser = optparse.OptionParser(version=version, usage=usage)
- token = os.environ["OKEANOS_TOKEN"] if "OKEANOS_TOKEN" in os.environ \
- else None
-
parser.add_option("-o", "--outfile", type="string", dest="outfile",
default=None, action="callback",
callback=check_writable_dir, help="dump image to FILE",
action="append", metavar="KEY=VALUE")
parser.add_option("-t", "--token", dest="token", type="string",
- default=token, help="use this authentication token when "
- "uploading/registering images [Default: %s]" % token)
+ default=None, help="use this authentication token when "
+ "uploading/registering images")
parser.add_option("--print-sysprep", dest="print_sysprep", default=False,
help="print the enabled and disabled system preparation "
parser.add_option("--no-shrink", dest="shrink", default=True,
help="don't shrink any partition", action="store_false")
+ parser.add_option("--public", dest="public", default=False,
+ help="register image with cyclades as public",
+ action="store_true")
+
parser.add_option("--tmpdir", dest="tmp", type="string", default=None,
help="create large temporary image files under DIR",
metavar="DIR")
raise FatalError("You also need to set -u when -r option is set")
if options.upload and options.token is None:
- raise FatalError("Image uploading cannot be performed. "
+ raise FatalError(
+ "Image uploading cannot be performed. "
"No authentication token is specified. Use -t to set a token")
if options.tmp is not None and not os.path.isdir(options.tmp):
"(use --force to overwrite it)" % filename)
# Check if the authentication token is valid. The earlier the better
- try:
- account = Kamaki.get_account(options.token)
- if account is None:
- raise FatalError("The authentication token you provided is not "
- "valid!")
- except ClientError as e:
- raise FatalError("Astakos client: %d %s" % (e.status, e.message))
+ if options.token is not None:
+ try:
+ account = Kamaki.get_account(options.token)
+ if account is None:
+ raise FatalError("The authentication token you provided is not"
+ " valid!")
+ except ClientError as e:
+ raise FatalError("Astakos client: %d %s" % (e.status, e.message))
+
disk = Disk(options.source, out, options.tmp)
out.output("Uploading image to pithos:")
kamaki = Kamaki(account, out)
with open(snapshot, 'rb') as f:
- uploaded_obj = kamaki.upload(f, size, options.upload,
+ uploaded_obj = kamaki.upload(
+ f, size, options.upload,
"(1/4) Calculating block hashes",
"(2/4) Uploading missing blocks")
out.output()
if options.register:
- out.output('Registering image with ~okeanos ...', False)
- kamaki.register(options.register, uploaded_obj, metadata)
+ img_type = 'public' if options.public else 'private'
+ out.output('Registering %s image with ~okeanos ...' % img_type,
+ False)
+ kamaki.register(options.register, uploaded_obj, metadata,
+ options.public)
out.success('done')
out.output()
except ClientError as e: