summaryrefslogtreecommitdiffstats
path: root/utils/src
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2016-04-27 15:26:16 -0400
committerJason DeTiberus <detiber@gmail.com>2016-04-27 15:26:16 -0400
commite84c06b5d25cadb089bdccb89959b3f39f9aabe7 (patch)
treeab8d9f2d701742ef9e47df235b0833061f4b02d1 /utils/src
parent287b9527290bb01e88f43ea6a955795edcf24f38 (diff)
parentb6a7f95c4f582c82dc2abf9a90c17e4e098f8bbd (diff)
downloadopenshift-e84c06b5d25cadb089bdccb89959b3f39f9aabe7.tar.gz
openshift-e84c06b5d25cadb089bdccb89959b3f39f9aabe7.tar.bz2
openshift-e84c06b5d25cadb089bdccb89959b3f39f9aabe7.tar.xz
openshift-e84c06b5d25cadb089bdccb89959b3f39f9aabe7.zip
Merge pull request #1829 from smunilla/BZ1330919
a-o-i-: Allow empty proxy
Diffstat (limited to 'utils/src')
-rw-r--r--utils/src/ooinstall/cli_installer.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py
index 71bdbd5a1..0163f6d82 100644
--- a/utils/src/ooinstall/cli_installer.py
+++ b/utils/src/ooinstall/cli_installer.py
@@ -533,10 +533,14 @@ https://docs.openshift.com/enterprise/latest/install_config/http_proxies.html
click.echo(message)
message = "Specify the hostname for your proxy? (ENTER for none)"
- proxy_hostname = click.prompt(message)
+ proxy_hostname = click.prompt(message, default='')
+
+ if proxy_hostname:
+ message = "List any hosts that should be excluded from your proxy. (ENTER for none)"
+ proxy_excludes = click.prompt(message, default='')
+ else:
+ proxy_excludes = ''
- message = "List any hosts that should be excluded from your proxy. (ENTER for none)"
- proxy_excludes = click.prompt(message)
return proxy_hostname, proxy_excludes
def get_missing_info_from_user(oo_cfg):