summaryrefslogtreecommitdiffstats
path: root/inventory/byo/hosts.aep.example
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-04-25 16:15:56 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-04-25 16:15:56 -0400
commit7cf2ef446cde3f54d4c7095aba20e594c5747630 (patch)
tree64e983078a369637ea18c3be10ac1115bfa4ca8c /inventory/byo/hosts.aep.example
parent407dd1d28f06a3b66c2eeaa05a81279c7704779d (diff)
parent3262718f8fc4658a3b223823244f1f78cb0eb6c8 (diff)
downloadopenshift-7cf2ef446cde3f54d4c7095aba20e594c5747630.tar.gz
openshift-7cf2ef446cde3f54d4c7095aba20e594c5747630.tar.bz2
openshift-7cf2ef446cde3f54d4c7095aba20e594c5747630.tar.xz
openshift-7cf2ef446cde3f54d4c7095aba20e594c5747630.zip
Merge branch 'master' into evac
Diffstat (limited to 'inventory/byo/hosts.aep.example')
-rw-r--r--inventory/byo/hosts.aep.example27
1 files changed, 27 insertions, 0 deletions
diff --git a/inventory/byo/hosts.aep.example b/inventory/byo/hosts.aep.example
index 30d31bc12..d57cb4947 100644
--- a/inventory/byo/hosts.aep.example
+++ b/inventory/byo/hosts.aep.example
@@ -342,6 +342,33 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
# be used with 1.0 and 3.0.
# openshift_use_dnsmasq=False
+# Global Proxy Configuration
+# These options configure HTTP_PROXY, HTTPS_PROXY, and NOPROXY environment
+# variables for docker and master services.
+#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'
+#
+# Most environments don't require a proxy between openshift masters, nodes, and
+# etcd hosts. So automatically add those hostnames to the openshift_no_proxy list.
+# If all of your hosts share a common domain you may wish to disable this and
+# specify that domain above.
+#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
+# 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
+# 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"}}}'
+
+
+
# host group for masters
[masters]
aep3-master[1:3]-ansible.test.example.com