diff options
author | Jason DeTiberus <detiber@gmail.com> | 2016-04-26 11:17:01 -0400 |
---|---|---|
committer | Jason DeTiberus <detiber@gmail.com> | 2016-04-26 11:17:01 -0400 |
commit | 432a700960e9a09177432e71a8cdc2a496891c1f (patch) | |
tree | 273cd7fe4d1dd5a458fae54b5197acbc2f426fba /utils/src/ooinstall/cli_installer.py | |
parent | 44407f04615073f1ffde4bf31f6a2a5894c7bafc (diff) | |
parent | 5647c1364b481107c00aef2c4e038b7eb2efb0db (diff) | |
download | openshift-432a700960e9a09177432e71a8cdc2a496891c1f.tar.gz openshift-432a700960e9a09177432e71a8cdc2a496891c1f.tar.bz2 openshift-432a700960e9a09177432e71a8cdc2a496891c1f.tar.xz openshift-432a700960e9a09177432e71a8cdc2a496891c1f.zip |
Merge pull request #1765 from smunilla/proxy_ui
a-o-i: UI additions for proxies
Diffstat (limited to 'utils/src/ooinstall/cli_installer.py')
-rw-r--r-- | utils/src/ooinstall/cli_installer.py | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py index 3d6b24138..71bdbd5a1 100644 --- a/utils/src/ooinstall/cli_installer.py +++ b/utils/src/ooinstall/cli_installer.py @@ -520,6 +520,24 @@ def error_if_missing_info(oo_cfg): if missing_info: sys.exit(1) +def get_proxy_hostname_and_excludes(): + message = """ +If a proxy is needed to reach HTTP and HTTPS traffic please enter the name below. +This proxy will be configured by default for all processes needing to reach systems outside +the cluster. + +More advanced configuration is possible if using ansible directly: + +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) + + 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): """ Prompts the user for any information missing from the given configuration. """ @@ -566,6 +584,13 @@ https://docs.openshift.com/enterprise/latest/admin_guide/install/prerequisites.h oo_cfg.settings['master_routingconfig_subdomain'] = get_master_routingconfig_subdomain() click.clear() + if not oo_cfg.settings.get('openshift_http_proxy', None): + proxy_hostname, proxy_excludes = get_proxy_hostname_and_excludes() + oo_cfg.settings['openshift_http_proxy'] = proxy_hostname + oo_cfg.settings['openshift_https_proxy'] = proxy_hostname + oo_cfg.settings['openshift_no_proxy'] = proxy_excludes + click.clear() + return oo_cfg |