ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-06-28 03:00:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #10723 from mscherer/fix_errors_playbook

Browse source 
Fix errors reporting for playbook/*
This commit is contained in:
Toshio Kuratomi 2015-04-15 09:16:30 -07:00
commit baad0a62f9
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
v2/ansible/playbook/become.py
View file

@ -45,11 +45,11 @@ class Become:
if has_become: if has_become:
msg = 'The become params ("become", "become_user") and' msg = 'The become params ("become", "become_user") and'
if has_sudo: if has_sudo:
raise errors.AnsibleParserError('%s sudo params ("sudo", "sudo_user") cannot be used together' % msg) raise AnsibleParserError('%s sudo params ("sudo", "sudo_user") cannot be used together' % msg)
elif has_su: elif has_su:
raise errors.AnsibleParserError('%s su params ("su", "su_user") cannot be used together' % msg) raise AnsibleParserError('%s su params ("su", "su_user") cannot be used together' % msg)
elif has_sudo and has_su: elif has_sudo and has_su:
raise errors.AnsibleParserError('sudo params ("sudo", "sudo_user") and su params ("su", "su_user") cannot be used together') raise AnsibleParserError('sudo params ("sudo", "sudo_user") and su params ("su", "su_user") cannot be used together')
def _preprocess_data_become(self, ds): def _preprocess_data_become(self, ds):
"""Preprocess the playbook data for become attributes """Preprocess the playbook data for become attributes

1
v2/ansible/playbook/playbook_include.py
View file

@ -27,6 +27,7 @@ from ansible.playbook.attribute import FieldAttribute
from ansible.playbook.base import Base from ansible.playbook.base import Base
from ansible.playbook.conditional import Conditional from ansible.playbook.conditional import Conditional
from ansible.playbook.taggable import Taggable from ansible.playbook.taggable import Taggable
from ansible.errors import AnsibleParserError
class PlaybookInclude(Base): class PlaybookInclude(Base):