openstack/python-novaclient
Code Issues Proposed changes

Added support to specify more boot options.

Browse Source 
User data can be a file name only, removed support for user data string.
This commit is contained in:
Unmesh Gurjar 2011-10-17 12:46:05 +05:30
parent 772609aa45
commit 0b0abff452
1 changed files with 6 additions and 3 deletions

9
novaclient/v1_1/shell.py

@ -83,7 +83,11 @@ def _boot(cs, args, reservation_id=None, min_count=None, max_count=None):
raise exceptions.CommandError("Can't open '%s': %s" % (keyfile, e)) raise exceptions.CommandError("Can't open '%s': %s" % (keyfile, e))
if args.user_data: if args.user_data:
user_data = args.user_data try:
user_data = open(args.user_data)
except IOError, e:
raise exceptions.CommandError("Can't open '%s': %s" % \
(args.user_data, e))
else: else:
user_data = None user_data = None
@ -133,8 +137,7 @@ def _boot(cs, args, reservation_id=None, min_count=None, max_count=None):
@utils.arg('--user_data', @utils.arg('--user_data',
default=None, default=None,
metavar='<user-data>', metavar='<user-data>',
help="user data to pass to be exposed by the metadata "\ help="user data file to pass to be exposed by the metadata server.")
"server this can be a file type object as well or a string.")
@utils.arg('--availability_zone', @utils.arg('--availability_zone',
default=None, default=None,
metavar='<availability-zone>', metavar='<availability-zone>',