diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-07-20 14:22:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-20 14:22:14 -0400 |
| commit | c257b47a9138eff4e384218a8eef23f9bfeb701f (patch) | |
| tree | a8c5afbd792a7b9fb7f54099e1b22a38993845ef /utils/src/ooinstall | |
| parent | a7e6148bb5c5fa9746de5c351a6b0a4d065d82d4 (diff) | |
| parent | edd45383475297811613ec9c8df1e9cabb0ef166 (diff) | |
| download | openshift-c257b47a9138eff4e384218a8eef23f9bfeb701f.tar.gz openshift-c257b47a9138eff4e384218a8eef23f9bfeb701f.tar.bz2 openshift-c257b47a9138eff4e384218a8eef23f9bfeb701f.tar.xz openshift-c257b47a9138eff4e384218a8eef23f9bfeb701f.zip | |
Merge pull request #2170 from smunilla/unattended_required_facts
a-o-i: Looser facts requirements for unattended
Diffstat (limited to 'utils/src/ooinstall')
| -rw-r--r-- | utils/src/ooinstall/cli_installer.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py index d052ad852..c9c13501d 100644 --- a/utils/src/ooinstall/cli_installer.py +++ b/utils/src/ooinstall/cli_installer.py @@ -512,13 +512,6 @@ def error_if_missing_info(oo_cfg): sys.exit(1) oo_cfg.settings['variant_version'] = version.name - missing_facts = oo_cfg.calc_missing_facts() - if len(missing_facts) > 0: - missing_info = True - click.echo('For unattended installs, facts must be provided for all masters/nodes:') - for host in missing_facts: - click.echo('Host "%s" missing facts: %s' % (host, ", ".join(missing_facts[host]))) - # check that all listed host roles are included listed_roles = get_host_roles_set(oo_cfg) configured_roles = set([role for role in oo_cfg.deployment.roles]) @@ -991,7 +984,7 @@ def install(ctx, force, gen_inventory): # TODO: if there are *new* nodes and this is a live install, we may need the user # to confirm the settings for new nodes. Look into this once we're distinguishing # between new and pre-existing nodes. - if len(oo_cfg.calc_missing_facts()) > 0: + if not ctx.obj['unattended'] and len(oo_cfg.calc_missing_facts()) > 0: confirm_hosts_facts(oo_cfg, callback_facts) # Write quick installer config file to disk: |