summaryrefslogtreecommitdiffstats
path: root/inventory/byo/hosts.ose.example
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@afrolegs.com>2016-05-24 14:54:14 -0400
committerAndrew Butcher <abutcher@afrolegs.com>2016-05-24 14:54:14 -0400
commit5a065cd174f91eeafa30b978841684565fb6f449 (patch)
tree550d5f55ecb0d738728100e962c9d87a6036ff4d /inventory/byo/hosts.ose.example
parenteab842f5b6e5c04cda06c94cf8db3281d82c8ad6 (diff)
parent02a4d70c55ba89bde345d82e0731c70626209ee0 (diff)
downloadopenshift-5a065cd174f91eeafa30b978841684565fb6f449.tar.gz
openshift-5a065cd174f91eeafa30b978841684565fb6f449.tar.bz2
openshift-5a065cd174f91eeafa30b978841684565fb6f449.tar.xz
openshift-5a065cd174f91eeafa30b978841684565fb6f449.zip
Merge pull request #1926 from sdodson/clarify-proxy-example
Clarify the example inventory related to proxies and builddefaults
Diffstat (limited to 'inventory/byo/hosts.ose.example')
-rw-r--r--inventory/byo/hosts.ose.example15
1 files changed, 8 insertions, 7 deletions
diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example
index cb46c352e..2a8d4c02b 100644
--- a/inventory/byo/hosts.ose.example
+++ b/inventory/byo/hosts.ose.example
@@ -395,14 +395,15 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
#openshift_generate_no_proxy_hosts=True
#
# These options configure the BuildDefaults admission controller which injects
-# environment variables into Builds. These values will default to their
-# corresponding values above but you may set them independently. See BuildDefaults
+# environment variables into Builds. These values will default to the global proxy
+# config values. You only need to set these if they differ from the global settings
+# above. See BuildDefaults
# documentation at https://docs.openshift.org/latest/admin_guide/build_defaults_overrides.html
-#openshift_builddefaults_http_proxy=openshift_http_proxy
-#openshift_builddefaults_https_proxy=openshift_https_proxy
-#openshift_builddefaults_no_proxy=openshift_noproxy
-#openshift_builddefaults_git_http_proxy=openshift_builddefaults_http_proxy
-#openshift_builddefaults_git_https_proxy=openshift_builddefaults_https_proxy
+#openshift_builddefaults_http_proxy=http://USER:PASSWORD@HOST:PORT
+#openshift_builddefaults_https_proxy=https://USER:PASSWORD@HOST:PORT
+#openshift_builddefaults_no_proxy=build_defaults
+#openshift_builddefaults_git_http_proxy=http://USER:PASSWORD@HOST:PORT
+#openshift_builddefaults_git_https_proxy=https://USER:PASSWORD@HOST:PORT
# Or you may optionally define your own serialized as json
#openshift_builddefaults_json='{"BuildDefaults":{"configuration":{"apiVersion":"v1","env":[{"name":"HTTP_PROXY","value":"http://proxy.example.com.redhat.com:3128"},{"name":"NO_PROXY","value":"ose3-master.example.com"}],"gitHTTPProxy":"http://proxy.example.com:3128","kind":"BuildDefaultsConfig"}}}'