diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-01-11 15:05:27 -0500 | 
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-01-11 15:05:27 -0500 | 
| commit | e5fd55cf81776adeef252b9de31b7dd5203624b6 (patch) | |
| tree | b65996731f32444da360bd6ace2e1509fa2527bb /utils | |
| parent | 6d2e202d514784df66b4f663ae725da7ef4499ae (diff) | |
| parent | 1da2b5f6ed62329d6f5cdc1df90106e5c896ef1e (diff) | |
| download | openshift-e5fd55cf81776adeef252b9de31b7dd5203624b6.tar.gz openshift-e5fd55cf81776adeef252b9de31b7dd5203624b6.tar.bz2 openshift-e5fd55cf81776adeef252b9de31b7dd5203624b6.tar.xz openshift-e5fd55cf81776adeef252b9de31b7dd5203624b6.zip | |
Merge pull request #1163 from sdodson/qi-containers
re-enable containerize installs
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 c86ba2f4f..3c6de44cf 100644 --- a/utils/src/ooinstall/cli_installer.py +++ b/utils/src/ooinstall/cli_installer.py @@ -130,14 +130,13 @@ http://docs.openshift.com/enterprise/latest/architecture/infrastructure_componen          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 +        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 = Host(**host_props) | 
