summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README_AWS.md4
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j26
2 files changed, 6 insertions, 4 deletions
diff --git a/README_AWS.md b/README_AWS.md
index 7f4b1832b..5db36b5cb 100644
--- a/README_AWS.md
+++ b/README_AWS.md
@@ -27,10 +27,10 @@ In case of a cluster creation, or any other case where you don't know the machin
to setup a private key file to allow ansible to connect to the created hosts.
To do so, add the the following entry to your $HOME/.ssh/config file and make it point to the private key file which allows you to login on AWS.
-'''
+```
Host *.compute-1.amazonaws.com
PrivateKey $HOME/.ssh/my_private_key.pem
-'''
+```
Alternatively, you can configure your ssh-agent to hold the credentials to connect to your AWS instances.
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