# or implied, of GRNET S.A.
from image_creator import __version__ as version
-from image_creator import util
from image_creator.disk import Disk
from image_creator.util import FatalError, MD5
from image_creator.output.cli import SilentOutput, SimpleOutput, \
OutputWthProgress
-from image_creator.os_type import os_cls
from image_creator.kamaki_wrapper import Kamaki, ClientError
import sys
import os
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)
try:
snapshot = disk.snapshot()
- dev = disk.get_device(snapshot)
+ image = disk.get_image(snapshot)
# If no customization is to be applied, the image should be mounted ro
- readonly = (not (options.sysprep or options.shrink) or
- options.print_sysprep)
- dev.mount(readonly)
-
- cls = os_cls(dev.distro, dev.ostype)
- image_os = cls(dev.root, dev.g, out)
- out.output()
-
- for sysprep in options.disabled_syspreps:
- image_os.disable_sysprep(image_os.get_sysprep_by_name(sysprep))
+ ro = (not (options.sysprep or options.shrink) or options.print_sysprep)
+ image.mount(ro)
+ try:
+ for sysprep in options.disabled_syspreps:
+ image.os.disable_sysprep(image.os.get_sysprep_by_name(sysprep))
- for sysprep in options.enabled_syspreps:
- image_os.enable_sysprep(image_os.get_sysprep_by_name(sysprep))
+ for sysprep in options.enabled_syspreps:
+ image.os.enable_sysprep(image.os.get_sysprep_by_name(sysprep))
- if options.print_sysprep:
- image_os.print_syspreps()
- out.output()
+ if options.print_sysprep:
+ image.os.print_syspreps()
+ out.output()
- if options.outfile is None and not options.upload:
- return 0
+ if options.outfile is None and not options.upload:
+ return 0
- if options.sysprep:
- image_os.do_sysprep()
+ if options.sysprep:
+ image.os.do_sysprep()
- metadata = image_os.meta
- dev.umount()
+ metadata = image.os.meta
+ finally:
+ image.umount()
- size = options.shrink and dev.shrink() or dev.size
- metadata.update(dev.meta)
+ size = options.shrink and image.shrink() or image.size
+ metadata.update(image.meta)
# Add command line metadata to the collected ones...
metadata.update(options.metadata)
md5 = MD5(out)
- checksum = md5.compute(snapshot, size)
+ checksum = md5.compute(image.device, size)
metastring = '\n'.join(
['%s=%s' % (key, value) for (key, value) in metadata.items()])
metastring += '\n'
if options.outfile is not None:
- dev.dump(options.outfile)
+ image.dump(options.outfile)
out.output('Dumping metadata file ...', False)
with open('%s.%s' % (options.outfile, 'meta'), 'w') as f:
os.path.basename(options.outfile)))
out.success('done')
- # Destroy the device. We only need the snapshot from now on
- disk.destroy_device(dev)
+ # Destroy the image instance. We only need the snapshot from now on
+ disk.destroy_image(image)
out.output()
try:
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:
projects / snf-image-creator / blobdiff