summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/templates
diff options
context:
space:
mode:
authorDiego Castro <spinolacastro@gmail.com>2015-08-15 16:37:48 -0300
committerDiego Castro <spinolacastro@gmail.com>2015-08-15 16:37:48 -0300
commite7925364342c9a324d91e750ba56aa41ad789419 (patch)
tree289116d3a701ad67730794f8bcf7d71dbdc657f4 /roles/openshift_master/templates
parent1d764a0bebbbb12e3c3142c59b10fae34c8b7211 (diff)
parent30d653aa5b776afbf35c98b1b5e7436f8cb7123c (diff)
downloadopenshift-e7925364342c9a324d91e750ba56aa41ad789419.tar.gz
openshift-e7925364342c9a324d91e750ba56aa41ad789419.tar.bz2
openshift-e7925364342c9a324d91e750ba56aa41ad789419.tar.xz
openshift-e7925364342c9a324d91e750ba56aa41ad789419.zip
Merge remote-tracking branch 'openshift/master' into project_config
Diffstat (limited to 'roles/openshift_master/templates')
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j26
1 files changed, 6 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index 20dfe155a..b738084c0 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -2,6 +2,9 @@ apiLevels:
- v1beta3
- v1
apiVersion: v1
+{% if api_server_args is defined and api_server_args %}
+apiServerArguments: {{ api_server_args }}
+{% endif %}
assetConfig:
logoutURL: ""
masterPublicURL: {{ openshift.master.public_api_url }}
@@ -13,6 +16,9 @@ assetConfig:
keyFile: master.server.key
maxRequestsInFlight: 0
requestTimeoutSeconds: 0
+{% if controller_args is defined and controller_args %}
+controllerArguments: {{ controller_args }}
+{% endif %}
corsAllowedOrigins:
{% for origin in ['127.0.0.1', 'localhost', openshift.common.hostname, openshift.common.ip, openshift.common.public_hostname, openshift.common.public_ip] %}
- {{ origin }}