summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-11-20 13:34:37 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2015-11-20 13:34:37 -0500
commit191bfbaa614b1eeafe4785edd295e1e0b3498175 (patch)
treec514a0d41ae62a1eb7aec37ecbb2d6e3c08b6949
parentca2e6af84b5d3f5239302348011b053c596a6ac6 (diff)
parent32db6b68266ab0c44260be878c6eaf64a9d495dc (diff)
downloadopenshift-191bfbaa614b1eeafe4785edd295e1e0b3498175.tar.gz
openshift-191bfbaa614b1eeafe4785edd295e1e0b3498175.tar.bz2
openshift-191bfbaa614b1eeafe4785edd295e1e0b3498175.tar.xz
openshift-191bfbaa614b1eeafe4785edd295e1e0b3498175.zip
Merge pull request #914 from smunilla/pylint_fixes
atomic-openshift-installer: pylint fixes
-rw-r--r--utils/src/ooinstall/cli_installer.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py
index a1632ed0c..94f7afdc9 100644
--- a/utils/src/ooinstall/cli_installer.py
+++ b/utils/src/ooinstall/cli_installer.py
@@ -337,7 +337,8 @@ def get_hosts_to_run_on(oo_cfg, callback_facts, unattended, force, verbose):
# This check has to happen before we start removing hosts later in this method
if not force:
if not unattended:
- click.echo('By default the installer only adds new nodes to an installed environment.')
+ click.echo('By default the installer only adds new nodes ' \
+ 'to an installed environment.')
response = click.prompt('Do you want to (1) only add additional nodes or ' \
'(2) reinstall the existing hosts ' \
'potentially erasing any custom changes?',
@@ -374,8 +375,8 @@ def get_hosts_to_run_on(oo_cfg, callback_facts, unattended, force, verbose):
else:
if unattended:
if not force:
- click.echo('Installed environment detected and no additional nodes specified: ' \
- 'aborting. If you want a fresh install, use ' \
+ click.echo('Installed environment detected and no additional ' \
+ 'nodes specified: aborting. If you want a fresh install, use ' \
'`atomic-openshift-installer install --force`')
sys.exit(1)
else:
@@ -389,8 +390,8 @@ def get_hosts_to_run_on(oo_cfg, callback_facts, unattended, force, verbose):
click.echo('Gathering information from hosts...')
callback_facts, error = openshift_ansible.default_facts(oo_cfg.hosts, verbose)
if error:
- click.echo("There was a problem fetching the required information. " \
- "See {} for details.".format(oo_cfg.settings['ansible_log_path']))
+ click.echo("There was a problem fetching the required information. See " \
+ "{} for details.".format(oo_cfg.settings['ansible_log_path']))
sys.exit(1)
else:
pass # proceeding as normal should do a clean install
@@ -431,6 +432,7 @@ def get_hosts_to_run_on(oo_cfg, callback_facts, unattended, force, verbose):
@click.option('-v', '--verbose',
is_flag=True, default=False)
#pylint: disable=too-many-arguments
+#pylint: disable=line-too-long
# Main CLI entrypoint, not much we can do about too many arguments.
def cli(ctx, unattended, configuration, ansible_playbook_directory, ansible_config, ansible_log_path, verbose):
"""