diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-01 14:30:51 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-01 14:30:51 -0400 |
| commit | 6442e49828127c65d64308311a5bdddf1120e816 (patch) | |
| tree | 7f9f94f23bfd21a677ec69ea328c7a382065d917 /utils | |
| parent | de1f1a07bce2604c72dfae09992c1f50fb2a9e28 (diff) | |
| parent | b9aef73b3d9444c99fa13fff3317751c7ec1495a (diff) | |
| download | openshift-6442e49828127c65d64308311a5bdddf1120e816.tar.gz openshift-6442e49828127c65d64308311a5bdddf1120e816.tar.bz2 openshift-6442e49828127c65d64308311a5bdddf1120e816.tar.xz openshift-6442e49828127c65d64308311a5bdddf1120e816.zip | |
Merge pull request #1544 from smunilla/BZ1299032
a-o-i: Error out early if callback_facts is None
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/src/ooinstall/cli_installer.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py index c3e81f4c6..50a688eca 100644 --- a/utils/src/ooinstall/cli_installer.py +++ b/utils/src/ooinstall/cli_installer.py @@ -666,7 +666,7 @@ def get_hosts_to_run_on(oo_cfg, callback_facts, unattended, force, verbose): openshift_ansible.set_config(oo_cfg) click.echo('Gathering information from hosts...') callback_facts, error = openshift_ansible.default_facts(oo_cfg.hosts, verbose) - if error: + if error or callback_facts is None: click.echo("There was a problem fetching the required information. See " \ "{} for details.".format(oo_cfg.settings['ansible_log_path'])) sys.exit(1) @@ -878,7 +878,7 @@ def install(ctx, force): click.echo('Gathering information from hosts...') callback_facts, error = openshift_ansible.default_facts(oo_cfg.hosts, verbose) - if error: + if error or callback_facts is None: click.echo("There was a problem fetching the required information. " \ "Please see {} for details.".format(oo_cfg.settings['ansible_log_path'])) sys.exit(1) |