Merge "Add volume-size flag to launch-node"

This commit is contained in:
Zuul 2018-08-27 19:17:44 +00:00 committed by Gerrit Code Review
commit 4dfd604936

View File

@ -200,13 +200,15 @@ def bootstrap_server(server, key, name, volume_device, keep,
def build_server(cloud, name, image, flavor, def build_server(cloud, name, image, flavor,
volume, keep, network, boot_from_volume, config_drive, volume, keep, network, boot_from_volume, config_drive,
mount_path, fs_label, availability_zone, environment): mount_path, fs_label, availability_zone, environment,
volume_size):
key = None key = None
server = None server = None
create_kwargs = dict(image=image, flavor=flavor, name=name, create_kwargs = dict(image=image, flavor=flavor, name=name,
reuse_ips=False, wait=True, reuse_ips=False, wait=True,
boot_from_volume=boot_from_volume, boot_from_volume=boot_from_volume,
volume_size=volume_size,
network=network, network=network,
config_drive=config_drive) config_drive=config_drive)
@ -302,6 +304,9 @@ def main():
help="Create a boot volume for the server and use it.", help="Create a boot volume for the server and use it.",
action='store_true', action='store_true',
default=False) default=False)
parser.add_argument("--volume-size", dest="volume_size",
help="Size of volume (GB) for --boot-from-volume",
default="50")
parser.add_argument("--keep", dest="keep", parser.add_argument("--keep", dest="keep",
help="Don't clean up or delete the server on error.", help="Don't clean up or delete the server on error.",
action='store_true', action='store_true',
@ -350,7 +355,7 @@ def main():
options.config_drive, options.config_drive,
options.mount_path, options.fs_label, options.mount_path, options.fs_label,
options.availability_zone, options.availability_zone,
options.environment) options.environment, options.volume_size)
dns.print_dns(cloud, server) dns.print_dns(cloud, server)
if __name__ == '__main__': if __name__ == '__main__':