6 files changed, 16 insertions, 5 deletions
diff --git a/inventory/byo/hosts.aep.example b/inventory/byo/hosts.aep.example
index 6d03b5da8..c31d39d59 100644
--- a/inventory/byo/hosts.aep.example
+++ b/inventory/byo/hosts.aep.example
@@ -191,6 +191,9 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 # openshift_master_access_token_max_seconds=86400
 # openshift_master_auth_token_max_seconds=500
 
+# Override master servingInfo.maxRequestsInFlight
+#openshift_master_max_requests_inflight=500
+
 # default storage plugin dependencies to install, by default the ceph and
 # glusterfs plugin dependencies will be installed, if available.
 #osn_storage_plugin_deps=['ceph','glusterfs','iscsi']
@@ -358,7 +361,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 ##openshift_hosted_registry_storage_openstack_filesystem=ext4
 
 # Configure node kubelet arguments
-#openshift_node_kubelet_args={'max-pods': ['40'], 'image-gc-high-threshold': ['90'], 'image-gc-low-threshold': ['80']}
+#openshift_node_kubelet_args={'max-pods': ['110'], 'image-gc-high-threshold': ['90'], 'image-gc-low-threshold': ['80']}
 
 # Configure logrotate scripts
 # See: https://github.com/nickhammond/ansible-logrotate
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example
index 826f5656f..3a7842a33 100644
--- a/inventory/byo/hosts.origin.example
+++ b/inventory/byo/hosts.origin.example
@@ -196,6 +196,9 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 # openshift_master_access_token_max_seconds=86400
 # openshift_master_auth_token_max_seconds=500
 
+# Override master servingInfo.maxRequestsInFlight
+#openshift_master_max_requests_inflight=500
+
 # default storage plugin dependencies to install, by default the ceph and
 # glusterfs plugin dependencies will be installed, if available.
 #osn_storage_plugin_deps=['ceph','glusterfs','iscsi']
@@ -363,7 +366,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 ##openshift_hosted_registry_storage_openstack_filesystem=ext4
 
 # Configure node kubelet arguments
-#openshift_node_kubelet_args={'max-pods': ['40'], 'image-gc-high-threshold': ['90'], 'image-gc-low-threshold': ['80']}
+#openshift_node_kubelet_args={'max-pods': ['110'], 'image-gc-high-threshold': ['90'], 'image-gc-low-threshold': ['80']}
 
 # Configure logrotate scripts
 # See: https://github.com/nickhammond/ansible-logrotate
diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example
index f2f436082..cb46c352e 100644
--- a/inventory/byo/hosts.ose.example
+++ b/inventory/byo/hosts.ose.example
@@ -192,6 +192,9 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 # openshift_master_access_token_max_seconds=86400
 # openshift_master_auth_token_max_seconds=500
 
+# Override master servingInfo.maxRequestsInFlight
+#openshift_master_max_requests_inflight=500
+
 # default storage plugin dependencies to install, by default the ceph and
 # glusterfs plugin dependencies will be installed, if available.
 #osn_storage_plugin_deps=['ceph','glusterfs']
@@ -359,7 +362,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 ##openshift_hosted_registry_storage_openstack_filesystem=ext4
 
 # Configure node kubelet arguments
-#openshift_node_kubelet_args={'max-pods': ['40'], 'image-gc-high-threshold': ['90'], 'image-gc-low-threshold': ['80']}
+#openshift_node_kubelet_args={'max-pods': ['110'], 'image-gc-high-threshold': ['90'], 'image-gc-low-threshold': ['80']}
 
 # Configure logrotate scripts
 # See: https://github.com/nickhammond/ansible-logrotate
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index b1ad537bc..f8e447b84 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -1702,7 +1702,8 @@ class OpenShiftFacts(object):
                                       oauth_grant_method='auto',
                                       scheduler_predicates=scheduler_predicates,
                                       scheduler_priorities=scheduler_priorities,
-                                      dynamic_provisioning_enabled=True)
+                                      dynamic_provisioning_enabled=True,
+                                      max_requests_inflight=500)
 
         if 'node' in roles:
             defaults['node'] = dict(labels={}, annotations={},
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index 48bb8a13f..17a10ae71 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -196,7 +196,7 @@ servingInfo:
   certFile: master.server.crt
   clientCA: ca.crt
   keyFile: master.server.key
-  maxRequestsInFlight: 500
+  maxRequestsInFlight: {{ openshift.master.max_requests_inflight }}
   requestTimeoutSeconds: 3600
 {% if openshift.master.named_certificates %}
   namedCertificates:
diff --git a/roles/openshift_master_facts/tasks/main.yml b/roles/openshift_master_facts/tasks/main.yml
index 0cbbaffc2..896dd5e35 100644
--- a/roles/openshift_master_facts/tasks/main.yml
+++ b/roles/openshift_master_facts/tasks/main.yml
@@ -76,3 +76,4 @@
       oauth_always_show_provider_selection: "{{ openshift_master_oauth_always_show_provider_selection | default(None) }}"
       image_policy_config: "{{ openshift_master_image_policy_config | default(None) }}"
       dynamic_provisioning_enabled: "{{ openshift_master_dynamic_provisioning_enabled | default(None) }}"
+      max_requests_inflight: "{{ openshift_master_max_requests_inflight | default(None) }}"