import os
import optparse
import StringIO
+import signal
def check_writable_dir(option, opt_str, value, parser):
usage = "Usage: %prog [options] <input_media>"
parser = optparse.OptionParser(version=version, usage=usage)
- account = os.environ["OKEANOS_USER"] if "OKEANOS_USER" in os.environ \
- else None
token = os.environ["OKEANOS_TOKEN"] if "OKEANOS_TOKEN" in os.environ \
else None
help="overwrite output files if they exist")
parser.add_option("-s", "--silent", dest="silent", default=False,
- help="silent mode, only output errors",
+ help="output only errors",
action="store_true")
parser.add_option("-u", "--upload", dest="upload", type="string",
help="register the image with ~okeanos as IMAGENAME",
metavar="IMAGENAME")
- parser.add_option("-a", "--account", dest="account", type="string",
- default=account, help="Use this ACCOUNT when "
- "uploading/registering images [Default: %s]" % account)
-
parser.add_option("-m", "--metadata", dest="metadata", default=[],
- help="Add custom KEY=VALUE metadata to the image",
+ help="add custom KEY=VALUE metadata to the image",
action="append", metavar="KEY=VALUE")
parser.add_option("-t", "--token", dest="token", type="string",
- default=token, help="Use this token when "
+ default=token, help="use this authentication token when "
"uploading/registering images [Default: %s]" % token)
parser.add_option("--print-sysprep", dest="print_sysprep", default=False,
metavar="SYSPREP")
parser.add_option("--no-sysprep", dest="sysprep", default=True,
- help="don't perform system preparation",
+ help="don't perform any system preparation operation",
action="store_false")
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")
+
options, args = parser.parse_args(input_args)
if len(args) != 1:
if options.register and not options.upload:
raise FatalError("You also need to set -u when -r option is set")
- if options.upload and options.account is None:
- raise FatalError("Image uploading cannot be performed. No ~okeanos "
- "account name is specified. Use -a to set an account "
- "name.")
-
if options.upload and options.token is None:
- raise FatalError("Image uploading cannot be performed. No ~okeanos "
- "token is specified. User -t to set a token.")
+ 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):
+ raise FatalError("The directory `%s' specified with --tmpdir is not "
+ "valid" % options.tmp)
meta = {}
for m in options.metadata:
try:
key, value = m.split('=', 1)
except ValueError:
- raise FatalError("Metadata option: `%s' is not in "
- "KEY=VALUE format." % m)
+ raise FatalError("Metadata option: `%s' is not in KEY=VALUE "
+ "format." % m)
meta[key] = value
options.metadata = meta
filename = "%s%s" % (options.outfile, extension)
if os.path.exists(filename):
raise FatalError("Output file %s exists "
- "(use --force to overwrite it)." % filename)
+ "(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))
+
+ disk = Disk(options.source, out, options.tmp)
+
+ def signal_handler(signum, frame):
+ disk.cleanup()
- disk = Disk(options.source, out)
+ signal.signal(signal.SIGINT, signal_handler)
+ signal.signal(signal.SIGTERM, signal_handler)
try:
snapshot = disk.snapshot()
if options.outfile is not None:
dev.dump(options.outfile)
- out.output('Dumping metadata file...', False)
+ out.output('Dumping metadata file ...', False)
with open('%s.%s' % (options.outfile, 'meta'), 'w') as f:
f.write(metastring)
out.success('done')
- out.output('Dumping md5sum file...', False)
+ out.output('Dumping md5sum file ...', False)
with open('%s.%s' % (options.outfile, 'md5sum'), 'w') as f:
f.write('%s %s\n' % (checksum,
os.path.basename(options.outfile)))
uploaded_obj = ""
if options.upload:
out.output("Uploading image to pithos:")
- kamaki = Kamaki(options.account, options.token, out)
+ kamaki = Kamaki(account, out)
with open(snapshot, 'rb') as f:
- uploaded_obj = kamaki.upload(f, size, options.upload,
- "(1/4) Calculating block "
- "hashes",
- "(2/4) Uploading missing "
- "blocks")
+ uploaded_obj = kamaki.upload(
+ f, size, options.upload,
+ "(1/4) Calculating block hashes",
+ "(2/4) Uploading missing blocks")
- out.output("(3/4) Uploading metadata file...", False)
+ out.output("(3/4) Uploading metadata file ...", False)
kamaki.upload(StringIO.StringIO(metastring),
size=len(metastring),
remote_path="%s.%s" % (options.upload, 'meta'))
out.success('done')
- out.output("(4/4) Uploading md5sum file...", False)
+ out.output("(4/4) Uploading md5sum file ...", False)
md5sumstr = '%s %s\n' % (checksum,
os.path.basename(options.upload))
kamaki.upload(StringIO.StringIO(md5sumstr),
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:
raise FatalError("Pithos client: %d %s" % (e.status, e.message))
finally:
- out.output('cleaning up...')
+ out.output('cleaning up ...')
disk.cleanup()
out.success("snf-image-creator exited without errors")
projects / snf-image-creator / blobdiff