diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-02-07 10:20:41 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-07 10:20:41 -0800 |
| commit | 4fe53adf947c7d202f0fc53569891af322e2a5f3 (patch) | |
| tree | fc3a6da3a60637cd74a8e08d798ba47e218a3041 /utils/src/ooinstall/cli_installer.py | |
| parent | b5a24da7b37515e7bfbfd46cfdd0f95ce3986711 (diff) | |
| parent | 62022c50253e3c37504fbbbc2e0c308f84bc2d83 (diff) | |
| download | openshift-4fe53adf947c7d202f0fc53569891af322e2a5f3.tar.gz openshift-4fe53adf947c7d202f0fc53569891af322e2a5f3.tar.bz2 openshift-4fe53adf947c7d202f0fc53569891af322e2a5f3.tar.xz openshift-4fe53adf947c7d202f0fc53569891af322e2a5f3.zip | |
Merge pull request #7045 from vrutkovs/quick-installer-new-playbook-paths
Automatic merge from submit-queue.
Quick installer: run prerequistes first and update path to main playbook
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1542895
Diffstat (limited to 'utils/src/ooinstall/cli_installer.py')
| -rw-r--r-- | utils/src/ooinstall/cli_installer.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py index eb42721b5..ffab3bfbf 100644 --- a/utils/src/ooinstall/cli_installer.py +++ b/utils/src/ooinstall/cli_installer.py @@ -796,6 +796,17 @@ If changes are needed please edit the installer.cfg.yml config file above and re if not unattended: confirm_continue(message) + error = openshift_ansible.run_prerequisites(inventory_file, oo_cfg.deployment.hosts, + hosts_to_run_on, verbose) + if error: + # The bootstrap script will print out the log location. + message = """ +An error was detected. After resolving the problem please relaunch the +installation process. +""" + click.echo(message) + sys.exit(1) + error = openshift_ansible.run_main_playbook(inventory_file, oo_cfg.deployment.hosts, hosts_to_run_on, verbose) |