summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-07-06 13:55:54 -0400
committerThomas Wiest <twiest@users.noreply.github.com>2015-07-06 13:55:54 -0400
commit80ea7241e019c1881bf8b536b8606f8ef22c583d (patch)
tree9b311f04b14859576328e9acb67e86005e1406d0
parent6a54f64f34ec13a69fae9d4e5527b0fb95a067ab (diff)
parent5e99c5791d48d42e67a1c92ff0c8f6a1b18e1208 (diff)
downloadopenshift-80ea7241e019c1881bf8b536b8606f8ef22c583d.tar.gz
openshift-80ea7241e019c1881bf8b536b8606f8ef22c583d.tar.bz2
openshift-80ea7241e019c1881bf8b536b8606f8ef22c583d.tar.xz
openshift-80ea7241e019c1881bf8b536b8606f8ef22c583d.zip
Merge pull request #290 from aveshagarwal/master-fixes
Changes related to latest openshift master.
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j26
1 files changed, 4 insertions, 2 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index 9df07e925..3b8b18c39 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -100,6 +100,8 @@ projectConfig:
mcsAllocatorRange: s0:/2
mcsLabelsPerProject: 5
uidAllocatorRange: 1000000000-1999999999/10000
+routingConfig:
+ subdomain: router.default.local
serviceAccountConfig:
managedNames:
- default
@@ -113,5 +115,5 @@ servingInfo:
certFile: master.server.crt
clientCA: ca.crt
keyFile: master.server.key
- maxRequestsInFlight: 0
- requestTimeoutSeconds: 0
+ maxRequestsInFlight: 500
+ requestTimeoutSeconds: 3600