diff options
author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-11-05 16:27:43 -0500 |
---|---|---|
committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-11-05 16:27:43 -0500 |
commit | c73ec7b6b27483aea4bb53db0db9837ff9781d24 (patch) | |
tree | 27ab3e06fe896997bf0f59b0ac3b6b54728f4425 /roles/openshift_master/templates/atomic-openshift-master-controllers.j2 | |
parent | d01f131de68bf88e4e3fb4c81450922a30285804 (diff) | |
parent | 11e7783d4b4177f100ecea8a8ffafbfb07ec47ee (diff) | |
download | openshift-c73ec7b6b27483aea4bb53db0db9837ff9781d24.tar.gz openshift-c73ec7b6b27483aea4bb53db0db9837ff9781d24.tar.bz2 openshift-c73ec7b6b27483aea4bb53db0db9837ff9781d24.tar.xz openshift-c73ec7b6b27483aea4bb53db0db9837ff9781d24.zip |
Merge pull request #608 from abutcher/native-ha
Native Support for Multi-Master HA
Diffstat (limited to 'roles/openshift_master/templates/atomic-openshift-master-controllers.j2')
-rw-r--r-- | roles/openshift_master/templates/atomic-openshift-master-controllers.j2 | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/atomic-openshift-master-controllers.j2 b/roles/openshift_master/templates/atomic-openshift-master-controllers.j2 new file mode 100644 index 000000000..205934248 --- /dev/null +++ b/roles/openshift_master/templates/atomic-openshift-master-controllers.j2 @@ -0,0 +1,9 @@ +OPTIONS= +CONFIG_FILE={{ openshift_master_config_dir }}/master-config.yaml + +# Proxy configuration +# Origin uses standard HTTP_PROXY environment variables. Be sure to set +# NO_PROXY for your master +#NO_PROXY=master.example.com +#HTTP_PROXY=http://USER:PASSWORD@IPADDR:PORT +#HTTPS_PROXY=https://USER:PASSWORD@IPADDR:PORT |