summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-07-13 15:11:49 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-07-13 15:11:49 -0300
commit6bfa3dee1efb32f20dcdcb4c7964ffd02969d1f1 (patch)
tree5e50e1b265ed9c107234555c2850293f73863650
parent2a4f65ad4b19fc594851195b3180d1fe81853909 (diff)
downloadopenshift-6bfa3dee1efb32f20dcdcb4c7964ffd02969d1f1.tar.gz
openshift-6bfa3dee1efb32f20dcdcb4c7964ffd02969d1f1.tar.bz2
openshift-6bfa3dee1efb32f20dcdcb4c7964ffd02969d1f1.tar.xz
openshift-6bfa3dee1efb32f20dcdcb4c7964ffd02969d1f1.zip
Remove too recent pylint option keys.
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py4
-rw-r--r--utils/src/ooinstall/cli_installer.py1
2 files changed, 2 insertions, 3 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 *
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py
index 71734e792..5a66c3592 100644
--- a/utils/src/ooinstall/cli_installer.py
+++ b/utils/src/ooinstall/cli_installer.py
@@ -60,7 +60,6 @@ def list_hosts(hosts):
for idx in hosts_idx:
click.echo(' {}: {}'.format(idx, hosts[idx]))
-# pylint: disable=redefined-variable-type
def delete_hosts(hosts):
while True:
list_hosts(hosts)