diff options
author | Devan Goodwin <dgoodwin@redhat.com> | 2016-07-13 15:11:49 -0300 |
---|---|---|
committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-07-13 15:11:49 -0300 |
commit | 6bfa3dee1efb32f20dcdcb4c7964ffd02969d1f1 (patch) | |
tree | 5e50e1b265ed9c107234555c2850293f73863650 /roles | |
parent | 2a4f65ad4b19fc594851195b3180d1fe81853909 (diff) | |
download | openshift-6bfa3dee1efb32f20dcdcb4c7964ffd02969d1f1.tar.gz openshift-6bfa3dee1efb32f20dcdcb4c7964ffd02969d1f1.tar.bz2 openshift-6bfa3dee1efb32f20dcdcb4c7964ffd02969d1f1.tar.xz openshift-6bfa3dee1efb32f20dcdcb4c7964ffd02969d1f1.zip |
Remove too recent pylint option keys.
Diffstat (limited to 'roles')
-rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 3de8faace..226d707dc 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1220,7 +1220,7 @@ def apply_provider_facts(facts, provider_facts): # Disabling pylint too many branches. This function needs refactored # but is a very core part of openshift_facts. -# pylint: disable=too-many-branches,too-many-nested-blocks +# pylint: disable=too-many-branches def merge_facts(orig, new, additive_facts_to_overwrite, protected_facts_to_overwrite): """ Recursively merge facts dicts @@ -2152,7 +2152,7 @@ def main(): ansible_facts=openshift_facts.facts) # ignore pylint errors related to the module_utils import -# pylint: disable=redefined-builtin, unused-wildcard-import, wildcard-import, wrong-import-position +# pylint: disable=redefined-builtin, unused-wildcard-import, wildcard-import # import module snippets from ansible.module_utils.basic import * from ansible.module_utils.facts import * |