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

Nova and openstack don't accept base64-encoded userdata

Browse source 
This fixes my bad copypasta.
This commit is contained in:
Erik Johnson 2017-03-31 16:44:28 -05:00
parent 73f4c43e2a
commit 84ee693006
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
salt/cloud/clouds/nova.py
View file

@ -648,14 +648,14 @@ def request_instance(vm_=None, call=None):
'userdata_file', vm_, __opts__, search_global=False, default=None
)
if userdata_file is not None:
with salt.utils.fopen(userdata_file, 'r') as fp_:
userdata = salt.utils.cloud.userdata_template(
__opts__, vm_, fp_.read()
)
try:
kwargs['userdata'] = base64.b64encode(userdata)
with salt.utils.fopen(userdata_file, 'r') as fp_:
kwargs['userdata'] = salt.utils.cloud.userdata_template(
__opts__, vm_, fp_.read()
)
except Exception as exc:
log.exception('Failed to encode userdata: %s', exc)
log.exception(
'Failed to read userdata from %s: %s', userdata_file, exc)
kwargs['config_drive'] = config.get_cloud_config_value(
'config_drive', vm_, __opts__, search_global=False

12
salt/cloud/clouds/openstack.py
View file

@ -529,14 +529,14 @@ def request_instance(vm_=None, call=None):
'userdata_file', vm_, __opts__, search_global=False, default=None
)
if userdata_file is not None:
with salt.utils.fopen(userdata_file, 'r') as fp_:
userdata = salt.utils.cloud.userdata_template(
__opts__, vm_, fp_.read()
)
try:
kwargs['ex_userdata'] = base64.b64encode(userdata)
with salt.utils.fopen(userdata_file, 'r') as fp_:
kwargs['ex_userdata'] = salt.utils.cloud.userdata_template(
__opts__, vm_, fp_.read()
)
except Exception as exc:
log.exception('Failed to encode userdata: %s', exc)
log.exception(
'Failed to read userdata from %s: %s', userdata_file, exc)
config_drive = config.get_cloud_config_value(
'config_drive', vm_, __opts__, default=None, search_global=False