diff options
author | Toshio Kuratomi <a.badger@gmail.com> | 2015-04-15 09:16:30 -0700 |
---|---|---|
committer | Toshio Kuratomi <a.badger@gmail.com> | 2015-04-15 09:16:30 -0700 |
commit | baad0a62f9d5b94cb5088c73147c22a00c663947 (patch) | |
tree | 9a0a25234e0cda3863e8246fc8bb953726832f7c | |
parent | 3f03f76f97a663d1777ec9901c7f03ae7e0b88d2 (diff) | |
parent | b20d54520c1b635409057f7c73ffddab7bc9b07b (diff) | |
download | ansible-baad0a62f9d5b94cb5088c73147c22a00c663947.tar.gz |
Merge pull request #10723 from mscherer/fix_errors_playbook
Fix errors reporting for playbook/*
-rw-r--r-- | v2/ansible/playbook/become.py | 6 | ||||
-rw-r--r-- | v2/ansible/playbook/playbook_include.py | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/v2/ansible/playbook/become.py b/v2/ansible/playbook/become.py index 291cff2b71..272976929a 100644 --- a/v2/ansible/playbook/become.py +++ b/v2/ansible/playbook/become.py @@ -45,11 +45,11 @@ class Become: if has_become: msg = 'The become params ("become", "become_user") and' 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: - 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: - 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): """Preprocess the playbook data for become attributes diff --git a/v2/ansible/playbook/playbook_include.py b/v2/ansible/playbook/playbook_include.py index 2e4964fce9..5c91dd14ad 100644 --- a/v2/ansible/playbook/playbook_include.py +++ b/v2/ansible/playbook/playbook_include.py @@ -27,6 +27,7 @@ from ansible.playbook.attribute import FieldAttribute from ansible.playbook.base import Base from ansible.playbook.conditional import Conditional from ansible.playbook.taggable import Taggable +from ansible.errors import AnsibleParserError class PlaybookInclude(Base): |