summaryrefslogtreecommitdiffstats
path: root/utils/src/ooinstall/oo_config.py
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@afrolegs.com>2016-09-01 13:47:37 -0400
committerGitHub <noreply@github.com>2016-09-01 13:47:37 -0400
commit84c220e5e68fa8ead1f15b9af928c42c12ce853b (patch)
treed40d6b80f152ef65ae4efbf1fca1cbc7780fd266 /utils/src/ooinstall/oo_config.py
parent55683a581ab891e293c5a34c074c324009f1ba37 (diff)
parent54a494e0948c270a66b63dc9420d38bb5b68ff54 (diff)
downloadopenshift-84c220e5e68fa8ead1f15b9af928c42c12ce853b.tar.gz
openshift-84c220e5e68fa8ead1f15b9af928c42c12ce853b.tar.bz2
openshift-84c220e5e68fa8ead1f15b9af928c42c12ce853b.tar.xz
openshift-84c220e5e68fa8ead1f15b9af928c42c12ce853b.zip
Merge pull request #2367 from tbielawa/FixNewerPyLintErrors
Fix PyLint errors discovered when upgrading to newer version
Diffstat (limited to 'utils/src/ooinstall/oo_config.py')
-rw-r--r--utils/src/ooinstall/oo_config.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/utils/src/ooinstall/oo_config.py b/utils/src/ooinstall/oo_config.py
index 351c9905d..393b36f6f 100644
--- a/utils/src/ooinstall/oo_config.py
+++ b/utils/src/ooinstall/oo_config.py
@@ -2,10 +2,11 @@
import os
import sys
+import logging
import yaml
from pkg_resources import resource_filename
-import logging
+
installer_log = logging.getLogger('installer')
CONFIG_PERSIST_SETTINGS = [
@@ -326,6 +327,10 @@ class OOConfig(object):
self.settings['ansible_inventory_path'] = \
'{}/hosts'.format(os.path.dirname(self.config_path))
+ # pylint: disable=consider-iterating-dictionary
+ # Disabled because we shouldn't alter the container we're
+ # iterating over
+ #
# clean up any empty sets
for setting in self.settings.keys():
if not self.settings[setting]: