Browse Source

Merge pull request #1199 from smunilla/no_containerized_for_3.0

atomic-openshift-installer: Remove containerized install for 3.0
Brenton Leanhardt 9 years ago
parent
commit
2d5861e1c6
1 changed files with 7 additions and 8 deletions
  1. 7 8
      utils/src/ooinstall/cli_installer.py

+ 7 - 8
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