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

Add templating support for other cloud drivers that support userdata_file

Browse source
This commit is contained in:
Erik Johnson 2017-03-31 10:56:17 -05:00
parent be8d34c59b
commit cc2186f35a
3 changed files with 61 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
salt/cloud/clouds/azurearm.py
View file

@ -872,6 +872,9 @@ def request_instance(call=None, kwargs=None): # pylint: disable=unused-argument
userdata_file = config.get_cloud_config_value(
'userdata_file', vm_, __opts__, search_global=False, default=None
)
userdata_renderer = config.get_cloud_config_value(
'userdata_renderer', vm_, __opts__, search_global=False, default=None
)
if userdata_file is None:
userdata = config.get_cloud_config_value(
'userdata', vm_, __opts__, search_global=False, default=None
@ -882,6 +885,20 @@ def request_instance(call=None, kwargs=None): # pylint: disable=unused-argument
userdata = fh_.read()
if userdata is not None:
render_opts = __opts__.copy()
render_opts.update(vm_)
# Use the cloud profile's userdata_renderer, otherwise get it from the
# master configuration file.
renderer = __opts__.get('userdata_renderer', 'jinja') \
if userdata_renderer is None
else userdata_renderer
rend = salt.loader.render(render_opts, {})
blacklist = __opts__['renderer_blacklist']
whitelist = __opts__['renderer_whitelist']
userdata = compile_template(
':string:', rend, renderer, blacklist, whitelist, input_data=userdata,
)
os_kwargs['custom_data'] = base64.b64encode(userdata)
iface_data = create_interface(kwargs=vm_)

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

@ -645,12 +645,31 @@ def request_instance(vm_=None, call=None):
kwargs['files'][src_path] = files[src_path]
userdata_file = config.get_cloud_config_value(
'userdata_file', vm_, __opts__, search_global=False
'userdata_file', vm_, __opts__, search_global=False, default=None
)
userdata_renderer = config.get_cloud_config_value(
'userdata_renderer', vm_, __opts__, search_global=False, default=None
)
if userdata_file is not None:
with salt.utils.fopen(userdata_file, 'r') as fp:
kwargs['userdata'] = fp.read()
with salt.utils.fopen(userdata_file, 'r') as fp_:
userdata = fp_.read()
render_opts = __opts__.copy()
render_opts.update(vm_)
# Use the cloud profile's userdata_renderer, otherwise get it from the
# master configuration file.
renderer = __opts__.get('userdata_renderer', 'jinja') \
if userdata_renderer is None
else userdata_renderer
rend = salt.loader.render(render_opts, {})
blacklist = __opts__['renderer_blacklist']
whitelist = __opts__['renderer_whitelist']
userdata = compile_template(
':string:', rend, renderer, blacklist, whitelist, input_data=userdata,
)
kwargs['userdata'] = userdata
kwargs['config_drive'] = config.get_cloud_config_value(
'config_drive', vm_, __opts__, search_global=False

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

@ -526,12 +526,31 @@ def request_instance(vm_=None, call=None):
kwargs['ex_files'][src_path] = fp_.read()
userdata_file = config.get_cloud_config_value(
'userdata_file', vm_, __opts__, search_global=False
'userdata_file', vm_, __opts__, search_global=False, default=None
)
userdata_renderer = config.get_cloud_config_value(
'userdata_renderer', vm_, __opts__, search_global=False, default=None
)
if userdata_file is not None:
with salt.utils.fopen(userdata_file, 'r') as fp:
kwargs['ex_userdata'] = fp.read()
with salt.utils.fopen(userdata_file, 'r') as fp_:
userdata = fp_.read()
render_opts = __opts__.copy()
render_opts.update(vm_)
# Use the cloud profile's userdata_renderer, otherwise get it from the
# master configuration file.
renderer = __opts__.get('userdata_renderer', 'jinja') \
if userdata_renderer is None
else userdata_renderer
rend = salt.loader.render(render_opts, {})
blacklist = __opts__['renderer_blacklist']
whitelist = __opts__['renderer_whitelist']
userdata = compile_template(
':string:', rend, renderer, blacklist, whitelist, input_data=userdata,
)
kwargs['ex_userdata'] = userdata
config_drive = config.get_cloud_config_value(
'config_drive', vm_, __opts__, default=None, search_global=False