diff options
Diffstat (limited to 'utils/src/ooinstall/cli_installer.py')
| -rw-r--r-- | utils/src/ooinstall/cli_installer.py | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py index d052ad852..9fbb61a46 100644 --- a/utils/src/ooinstall/cli_installer.py +++ b/utils/src/ooinstall/cli_installer.py @@ -322,9 +322,7 @@ Note: Containerized storage hosts are not currently supported. else: host_props['connect_to'] = hostname_or_ip host_props['preconfigured'] = False - host_props['master'] = False - host_props['node'] = False - host_props['storage'] = True + host_props['roles'] = ['storage'] storage = Host(**host_props) hosts.append(storage) @@ -512,13 +510,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 +982,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: |