Skip to content

Commit

Permalink
Fix note from @sdodson about valid proxy values in inventory params
Browse files Browse the repository at this point in the history
CIDRs not allowed here. We add those in during templating automatically.
  • Loading branch information
tbielawa committed Jul 17, 2017
1 parent b142cea commit 1ad834a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion inventory/byo/hosts.origin.example
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
#
# Hosts in the openshift_no_proxy list will NOT use any globally
# configured HTTP(S)_PROXYs. openshift_no_proxy accepts domains
# (.example.com), hosts (example.com), and CIDR ranges (10.1.0.0/16)
# (.example.com), and hosts (example.com), and IP addresses.
#openshift_http_proxy=http://USER:PASSWORD@IPADDR:PORT
#openshift_https_proxy=https://USER:PASSWORD@IPADDR:PORT
#openshift_no_proxy='.hosts.example.com,some-host.com'
Expand Down
2 changes: 1 addition & 1 deletion inventory/byo/hosts.ose.example
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
#
# Hosts in the openshift_no_proxy list will NOT use any globally
# configured HTTP(S)_PROXYs. openshift_no_proxy accepts domains
# (.example.com), hosts (example.com), and CIDR ranges (10.1.0.0/16)
# (.example.com), hosts (example.com), and IP addresses.
#openshift_http_proxy=http://USER:PASSWORD@IPADDR:PORT
#openshift_https_proxy=https://USER:PASSWORD@IPADDR:PORT
#openshift_no_proxy='.hosts.example.com,some-host.com'
Expand Down

0 comments on commit 1ad834a

Please sign in to comment.