Merge "Follow up "Fix up userdata argument to rebuild"" into stable/queens

This commit is contained in:
Zuul 2019-03-28 23:02:17 +00:00 committed by Gerrit Code Review
commit aa52486f21
3 changed files with 14 additions and 7 deletions

View File

@ -1622,8 +1622,11 @@ class ShellTest(utils.TestCase):
'no_such_file')
cmd = ('rebuild sample-server %s --user-data %s'
% (FAKE_UUID_1, invalid_file))
self.assertRaises(exceptions.CommandError, self.run_command, cmd,
api_version='2.57')
ex = self.assertRaises(exceptions.CommandError, self.run_command, cmd,
api_version='2.57')
self.assertIn("Can't open '%(user_data)s': "
"[Errno 2] No such file or directory: '%(user_data)s'" %
{'user_data': invalid_file}, six.text_type(ex))
def test_rebuild_unset_user_data(self):
self.run_command('rebuild sample-server %s --user-data-unset' %

View File

@ -397,7 +397,8 @@ def _boot(cs, args):
for f in args.files:
try:
dst, src = f.split('=', 1)
files[dst] = open(src)
with open(src) as fo:
files[dst] = fo.read()
except IOError as e:
raise exceptions.CommandError(
_("Can't open '%(src)s': %(exc)s") %
@ -415,7 +416,8 @@ def _boot(cs, args):
if args.user_data:
try:
userdata = open(args.user_data)
with open(args.user_data) as f:
userdata = f.read()
except IOError as e:
raise exceptions.CommandError(_("Can't open '%(user_data)s': "
"%(exc)s") %
@ -1851,7 +1853,8 @@ def do_rebuild(cs, args):
"'--user-data'."))
elif args.user_data:
try:
kwargs['userdata'] = open(args.user_data)
with open(args.user_data) as f:
kwargs['userdata'] = f.read()
except IOError as e:
raise exceptions.CommandError(
_("Can't open '%(user_data)s': %(exc)s") % {

View File

@ -1,5 +1,6 @@
---
fixes:
- |
The user data argument to rebuild was passing the filename as is as userdata.
Now this passes the contents of the filename as intended.
The user data argument in the ``nova rebuild`` command was passing
the filename as userdata. Now this passes the contents of the file
as intended.