arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-24 09:18:08 +00:00
Code Issues Releases Wiki Activity

Adding GNS3-server code source info to default image name.

Browse Source 
Fixing spacing, etc before pull request.
This commit is contained in:
Kieron Bulloch 2014-06-17 00:02:17 -04:00 committed by Jerry Seutter
parent b4f4bad21a
commit 7d8aee98fd
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cloud-image/create_image.py
View File

@ -27,13 +27,11 @@ def main():
""" """
args = get_cli_args()
g = Github() g = Github()
args = get_cli_args()
if args.username: if args.username:
username = args.username username = args.username
else: else:
if 'OS_USERNAME' in os.environ: if 'OS_USERNAME' in os.environ:
username = os.environ.get('OS_USERNAME') username = os.environ.get('OS_USERNAME')
@ -42,7 +40,6 @@ def main():
if args.password: if args.password:
password = args.password password = args.password
else: else:
if 'OS_PASSWORD' in os.environ: if 'OS_PASSWORD' in os.environ:
password = os.environ.get('OS_PASSWORD') password = os.environ.get('OS_PASSWORD')
@ -51,7 +48,6 @@ def main():
if args.tenant: if args.tenant:
tenant = args.tenant tenant = args.tenant
else: else:
if 'OS_TENANT_NAME' in os.environ: if 'OS_TENANT_NAME' in os.environ:
tenant = os.environ.get('OS_TENANT_NAME') tenant = os.environ.get('OS_TENANT_NAME')
@ -60,7 +56,6 @@ def main():
if args.region: if args.region:
region = args.region region = args.region
else: else:
if 'OS_REGION_NAME' in os.environ: if 'OS_REGION_NAME' in os.environ:
region = os.environ.get('OS_REGION_NAME') region = os.environ.get('OS_REGION_NAME')
@ -93,7 +88,8 @@ def main():
if args.image_name: if args.image_name:
image_name = args.image_name image_name = args.image_name
else: else:
image_name = "gns3-%s" % (uuid.uuid4().hex[0:4]) image_name = "gns3-%s-%s-%s" % (args.source, selected_branch,
uuid.uuid4().hex[0:4])
if args.on_boot: if args.on_boot:
on_boot = True on_boot = True
@ -101,11 +97,9 @@ def main():
on_boot = False on_boot = False
startup_script = create_script(repo.svn_url, selected_branch, on_boot) startup_script = create_script(repo.svn_url, selected_branch, on_boot)
server_name = uuid.uuid4().hex server_name = uuid.uuid4().hex
instance = create_instance(username, password, tenant, region, server_name, instance = create_instance(username, password, tenant, region, server_name,
startup_script) startup_script)
passwd = uuid.uuid4().hex passwd = uuid.uuid4().hex
instance.change_password(passwd) instance.change_password(passwd)
# wait for the password change to be processed # wait for the password change to be processed
@ -128,7 +122,9 @@ def main():
print("Done.") print("Done.")
create_image(username, password, tenant, region, instance, image_name) image_id = create_image(username, password, tenant, region, instance,
image_name)
instance.delete()
def prompt_user_select(opts, text="Please select"): def prompt_user_select(opts, text="Please select"):
@ -217,7 +213,7 @@ def create_image(username, password, tenant, region, server,
sys.stdout.write("Creating image %s..." % image_name) sys.stdout.write("Creating image %s..." % image_name)
sys.stdout.flush() sys.stdout.flush()
server.create_image(image_name) image_id = server.create_image(image_name)
while 1: while 1:
server = nc.servers.get(server.id) server = nc.servers.get(server.id)
@ -230,6 +226,8 @@ def create_image(username, password, tenant, region, server,
print("Done.") print("Done.")
return image_id
def get_cli_args(): def get_cli_args():
""" Parse the CLI input. """ """ Parse the CLI input. """