diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-01-18 14:51:00 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-01-18 14:51:00 -0500 |
| commit | 2d5861e1c6a226f90e22adf4a35d45f293734807 (patch) | |
| tree | 2d6ed5753be745ab7ade967d89396e6ac874c2e5 /utils | |
| parent | c170904a45967e76bb3609cb196f1762106a2850 (diff) | |
| parent | 38f13a5663db409bc9552eeae817d8c24dc0ae97 (diff) | |
| download | openshift-2d5861e1c6a226f90e22adf4a35d45f293734807.tar.gz openshift-2d5861e1c6a226f90e22adf4a35d45f293734807.tar.bz2 openshift-2d5861e1c6a226f90e22adf4a35d45f293734807.tar.xz openshift-2d5861e1c6a226f90e22adf4a35d45f293734807.zip | |
Merge pull request #1199 from smunilla/no_containerized_for_3.0
atomic-openshift-installer: Remove containerized install for 3.0
Diffstat (limited to 'utils')
| -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 |