saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #30309 from rallytime/bp-30304

Browse source 
Back-port #30304 to 2015.8
This commit is contained in:
Nicole Thomas 2016-01-13 09:41:53 -07:00
commit 5154c71127
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/cloud/clouds/ec2.py
View file

@ -1625,7 +1625,7 @@ def request_instance(vm_=None, call=None):
userdata = fh_.read()
if userdata is not None:
params['UserData'] = base64.b64encode(userdata)
params[spot_prefix + 'UserData'] = base64.b64encode(userdata)
vm_size = config.get_cloud_config_value(
'size', vm_, __opts__, search_global=False