diff options
| author | Samuel Munilla <smunilla@redhat.com> | 2016-01-18 08:45:06 -0500 |
|---|---|---|
| committer | Samuel Munilla <smunilla@redhat.com> | 2016-01-18 08:45:06 -0500 |
| commit | 38f13a5663db409bc9552eeae817d8c24dc0ae97 (patch) | |
| tree | 84280e9ead8d3b01861d55c73a35e17d7b7cbb69 | |
| parent | bb1f8aa029078238cf32b038c8bffacb13c3765e (diff) | |
| download | openshift-38f13a5663db409bc9552eeae817d8c24dc0ae97.tar.gz openshift-38f13a5663db409bc9552eeae817d8c24dc0ae97.tar.bz2 openshift-38f13a5663db409bc9552eeae817d8c24dc0ae97.tar.xz openshift-38f13a5663db409bc9552eeae817d8c24dc0ae97.zip | |
atomic-openshift-installer: Remove containerized install for 3.0
This removes the option to specify a containerized install when
installing 3.0 in interactive mode.
| -rw-r--r-- | utils/src/ooinstall/cli_installer.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py index 4e30929da..1aacf3a4b 100644 --- a/utils/src/ooinstall/cli_installer.py +++ b/utils/src/ooinstall/cli_installer.py @@ -127,14 +127,13 @@ http://docs.openshift.com/enterprise/latest/architecture/infrastructure_componen masters_set = True host_props['node'] = True - #TODO: Reenable this option once container installs are out of tech preview - rpm_or_container = click.prompt('Will this host be RPM or Container based (rpm/container)?', - type=click.Choice(['rpm', 'container']), - default='rpm') - if rpm_or_container == 'container': - host_props['containerized'] = True - else: - host_props['containerized'] = False + host_props['containerized'] = False + if oo_cfg.settings['variant_version'] != '3.0': + rpm_or_container = click.prompt('Will this host be RPM or Container based (rpm/container)?', + type=click.Choice(['rpm', 'container']), + default='rpm') + if rpm_or_container == 'container': + host_props['containerized'] = True if existing_env: host_props['new_host'] = True |