Commit d89f612a authored by David Johnson's avatar David Johnson

Use the real Ubuntu18/Queens images.

Also tweak the instructions.
parent e301c39d
......@@ -413,7 +413,7 @@ for param in pc._parameterOrder:
pass
tourDescription = \
"This profile provides a highly-configurable OpenStack instance with a controller and one or more compute nodes (potentially at multiple Cloudlab sites) (and optionally a network manager node, in a split configuration). This profile runs x86 or ARM64 nodes. It sets up OpenStack Queens, Pike, Ocata, Newton, or Mitaka on Ubuntu 16.04 (Liberty on 15.10, Kilo on 15.04, and Juno on 14.10 are *deprecated*) according to your choice, and configures all OpenStack services, pulls in some VM disk images, and creates basic networks accessible via floating IPs. You'll be able to create instances and access them over the Internet in just a few minutes. When you click the Instantiate button, you'll be presented with a list of parameters that you can change to control what your OpenStack instance will look like; **carefully** read the parameter documentation on that page (or in the Instructions) to understand the various features available to you."
"This profile provides a highly-configurable OpenStack instance with a controller and one or more compute nodes (potentially at multiple Cloudlab sites) (and optionally a network manager node, in a split configuration). This profile runs x86 or arm64 nodes. It sets up OpenStack Queens, Pike, Ocata, Newton, or Mitaka on Ubuntu 16.04 (Liberty on 15.10, Kilo on 15.04, and Juno on 14.10 are *deprecated*) according to your choice, and configures all OpenStack services, pulls in some VM disk images, and creates basic networks accessible via floating IPs. You'll be able to create instances and access them over the Internet in just a few minutes. When you click the Instantiate button, you'll be presented with a list of parameters that you can change to control what your OpenStack instance will look like; **carefully** read the parameter documentation on that page (or in the Instructions) to understand the various features available to you."
###if not params.adminPass or len(params.adminPass) == 0:
passwdHelp = "Your OpenStack admin and instance VM password is randomly-generated by Cloudlab, and it is: `{password-adminPass}` ."
......@@ -592,15 +592,9 @@ elif params.release == 'ocata':
elif params.release == 'pike':
image_os = 'UBUNTU16-64'
image_tag_rel = '-P'
elif params.release == 'queens' \
and not (params.controllerDiskImage or params.networkManagerDiskImage \
or params.computeDiskImage):
spurn = "urn:publicid:IDN+emulab.net+image+emulab-ops//UBUNTU18-64-BETA"
params.controllerDiskImage = \
params.networkManagerDiskImage = \
params.computeDiskImage = spurn
params.fromScratch = True
params.doAptUpdate = True
elif params.release == 'queens':
image_os = 'UBUNTU18-64'
image_tag_rel = '-Q'
else:
image_os = 'UBUNTU16-64'
params.fromScratch = True
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment