diff options
-rwxr-xr-x | contrib/cloud/aws-import | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/contrib/cloud/aws-import b/contrib/cloud/aws-import index a93a008..65b77b1 100755 --- a/contrib/cloud/aws-import +++ b/contrib/cloud/aws-import @@ -3,6 +3,7 @@ import argparse from base64 import b64encode from concurrent.futures import ThreadPoolExecutor, as_completed +from datetime import date from hashlib import sha256 from itertools import count @@ -75,7 +76,7 @@ def launch_link(region, image_id): parser = argparse.ArgumentParser(description="Import AWS EC2 image (AMI)") parser.add_argument('--architecture', '-a', default='x86_64', help="CPU architecture") -parser.add_argument('--name', '-n', required=True, +parser.add_argument('--name', '-n', help="Image name") parser.add_argument('--public', '-p', action='store_true', help="Make image public") @@ -86,6 +87,13 @@ parser.add_argument('--wiki', '-w', metavar='FILE', parser.add_argument('image', help="iPXE disk image") args = parser.parse_args() +# Use default name if none specified +if not args.name: + args.name = 'iPXE (%s %s)' % ( + date.today().strftime('%Y-%m-%d'), + args.architecture, + ) + # Use all regions if none specified if not args.region: args.region = sorted(x['RegionName'] for x in |