summaryrefslogtreecommitdiffstats
path: root/utils/src
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-11-10 16:17:37 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2015-11-10 16:17:37 -0500
commit825ef4ce54e0be3987806ff3454e23208b564140 (patch)
tree3713d7a25bd6c6a063cd0cea8a0ecdf7b2bd76fb /utils/src
parent6ee3d4deb200219098596562e502ca34e550f6fd (diff)
parent7f4cafed723058ab7e79d11a826fca031d1d2aae (diff)
downloadopenshift-825ef4ce54e0be3987806ff3454e23208b564140.tar.gz
openshift-825ef4ce54e0be3987806ff3454e23208b564140.tar.bz2
openshift-825ef4ce54e0be3987806ff3454e23208b564140.tar.xz
openshift-825ef4ce54e0be3987806ff3454e23208b564140.zip
Merge pull request #860 from smunilla/disable_container_based_install
atomic-openshift-installer: Remove question for container install
Diffstat (limited to 'utils/src')
-rw-r--r--utils/src/ooinstall/cli_installer.py16
1 files changed, 9 insertions, 7 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py
index 08c2439f7..4c55002fb 100644
--- a/utils/src/ooinstall/cli_installer.py
+++ b/utils/src/ooinstall/cli_installer.py
@@ -112,13 +112,15 @@ http://docs.openshift.com/enterprise/latest/architecture/infrastructure_componen
host_props['master'] = click.confirm('Will this host be an OpenShift Master?')
host_props['node'] = True
- 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
+ #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
host = Host(**host_props)