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 #40666 from gtmanfred/userdata

Browse source 
make sure userdata is always defined in ec2
This commit is contained in:
Mike Place 2017-04-12 15:05:59 -06:00 • committed by GitHub
commit 3e41a248a5
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1676,6 +1676,7 @@ def request_instance(vm_=None, call=None):
image_id = vm_['image']
params[spot_prefix + 'ImageId'] = image_id
userdata = None
userdata_file = config.get_cloud_config_value(
'userdata_file', vm_, __opts__, search_global=False, default=None
)