Browse Source

Merge pull request #1829 from smunilla/BZ1330919

a-o-i-: Allow empty proxy
Jason DeTiberus 9 years ago
parent
commit
e84c06b5d2
1 changed files with 7 additions and 3 deletions
  1. 7 3
      utils/src/ooinstall/cli_installer.py

+ 7 - 3
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):