diff options
author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-19 08:35:28 -0500 |
---|---|---|
committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-19 08:35:28 -0500 |
commit | cf4817f81267d5e1fddabf9ffa4e6c71b336b97f (patch) | |
tree | 44986101837be4f3485867f93e6b968c9e964654 /utils/src/ooinstall/oo_config.py | |
parent | 8658a12b5efdf3c8b9a601763858e622342e45f5 (diff) | |
parent | 9fdfa2f571a6468c6afb5a2f90240a7232064726 (diff) | |
download | openshift-cf4817f81267d5e1fddabf9ffa4e6c71b336b97f.tar.gz openshift-cf4817f81267d5e1fddabf9ffa4e6c71b336b97f.tar.bz2 openshift-cf4817f81267d5e1fddabf9ffa4e6c71b336b97f.tar.xz openshift-cf4817f81267d5e1fddabf9ffa4e6c71b336b97f.zip |
Merge pull request #1411 from smunilla/pylint_16_feb_2016
a-o-i: pylint fixes related to too-long lines
Diffstat (limited to 'utils/src/ooinstall/oo_config.py')
-rw-r--r-- | utils/src/ooinstall/oo_config.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/utils/src/ooinstall/oo_config.py b/utils/src/ooinstall/oo_config.py index 4861b1b1b..b1af21773 100644 --- a/utils/src/ooinstall/oo_config.py +++ b/utils/src/ooinstall/oo_config.py @@ -147,7 +147,8 @@ class OOConfig(object): raise OOConfigFileError('Cannot open config file "{}": {}'.format(ferr.filename, ferr.strerror)) except yaml.scanner.ScannerError: - raise OOConfigFileError('Config file "{}" is not a valid YAML document'.format(self.config_path)) + raise OOConfigFileError( + 'Config file "{}" is not a valid YAML document'.format(self.config_path)) def _upgrade_legacy_config(self): new_hosts = [] @@ -180,7 +181,8 @@ class OOConfig(object): if not os.path.exists(self.settings['ansible_inventory_directory']): os.makedirs(self.settings['ansible_inventory_directory']) if 'ansible_plugins_directory' not in self.settings: - self.settings['ansible_plugins_directory'] = resource_filename(__name__, 'ansible_plugins') + self.settings['ansible_plugins_directory'] = \ + resource_filename(__name__, 'ansible_plugins') if 'version' not in self.settings: self.settings['version'] = 'v1' @@ -191,7 +193,8 @@ class OOConfig(object): if 'ansible_ssh_user' not in self.settings: self.settings['ansible_ssh_user'] = '' - self.settings['ansible_inventory_path'] = '{}/hosts'.format(self.settings['ansible_inventory_directory']) + self.settings['ansible_inventory_path'] = \ + '{}/hosts'.format(self.settings['ansible_inventory_directory']) # clean up any empty sets for setting in self.settings.keys(): |