cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixes bug when template is missing src argument

Browse source 
adds AttributeError to exception handling to change missing src argument

fixes #17391
This commit is contained in:
Peter Sprygada 2016-09-05 08:49:49 -04:00
parent 9c5bcda4fe
commit 439aa353f1
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/plugins/action/net_template.py
View file

@ -41,7 +41,7 @@ class ActionModule(ActionBase):
try: try:
self._handle_template() self._handle_template()
except ValueError as exc: except (ValueError, AttributeError) as exc:
return dict(failed=True, msg=exc.message) return dict(failed=True, msg=exc.message)
result.update(self._execute_module(module_name=self._task.action, result.update(self._execute_module(module_name=self._task.action,
@ -75,9 +75,12 @@ class ActionModule(ActionBase):
def _handle_template(self): def _handle_template(self):
src = self._task.args.get('src') src = self._task.args.get('src')
if not src:
raise ValueError('missing required arguments: src')
working_path = self._get_working_path() working_path = self._get_working_path()
if os.path.isabs(src) or urlparse.urlsplit('src').scheme: if os.path.isabs(src) or urlparse.urlsplit(src).scheme:
source = src source = src
else: else:
source = self._loader.path_dwim_relative(working_path, 'templates', src) source = self._loader.path_dwim_relative(working_path, 'templates', src)