Merge pull request #3919 from bfallonf/followup_3916

Bug 1376585 Followup to 3916

Author: Brice Fallon-Freeman

admin_guide/manage_nodes.adoc

@@ -402,7 +402,7 @@ kubeletArguments:
     - "80"
 ----
 
-<1> Number of pods that can run on this kubelet.
+<1> xref:../admin_guide/manage_nodes.adoc#admin-guide-max-pods-per-node[Maximum number of pods that can run on this kubelet].
 <2> Resolver configuration file used as the basis for the container DNS
 resolution configuration.
 <3> The percent of disk usage after which image garbage collection is always run.
@@ -427,6 +427,42 @@ openshift_node_kubelet_args={'max-pods': ['40'], 'resolv-conf': ['/etc/resolv.co
 ----
 ====
 
+[[admin-guide-max-pods-per-node]]
+=== Setting Maximum Pods Per Node
+
+In the *_/etc/origin/node/node-config.yaml_* file, two parameters control the
+maximum number of pods that can be scheduled to a node: `pods-per-core` and
+`max-pods`. When both options are in use, the lower of the two limits the number
+of pods on a node.
+
+`pods-per-core` sets the number of pods the node can run based on the number of
+processor cores on the node. For example, if `pods-per-core` is set to `10` on
+a node with 4 processor cores, the maxiumum number of pods allowed on the node
+will be 40.
+
+====
+----
+kubeletArguments:
+  pods-per-core:
+    - 10
+----
+====
+
+`max-pods` sets the number of pods the node can run to a fixed value, regardless
+of the properties of the node.
+
+====
+----
+kubeletArguments:
+  max-pods:
+    - 250
+----
+====
+
+Using the above example, the default value for `pods-per-core` is `10` and the
+default value for `max-pods` is `250`. This means that unless the node has 25
+cores or more, by default, `pods-per-core` will be the limiting factor.
+
 [[manage-node-change-node-traffic-interface]]
 == Changing Node Traffic Interface
 

admin_guide/overcommit.adoc

@@ -198,41 +198,6 @@ quota.openshift.io/cluster-resource-override-enabled: "false"
 In an overcommitted environment, it is important to properly configure your node
 to provide best system behavior.
 
-[[max-pods-per-node]]
-=== Setting Maximum Pods Per Node
-
-There are two flags that control the number of pods that can be scheduled to the
-node: `pods-per-core` and `max-pods`.  These flags interact and only the *lower*
-of the two will effectively limit the number of pods on a node.
-
-`pods-per-core` sets the number of pods the node can run based on the number of
-processor cores on the node. As an example, if `pods-per-core` is set to `10` on
-a node with 4 processor cores, the maxiumum number of pods allowed on the node
-will be 40.
-
-====
-----
-kubeletArguments:
-  pods-per-core:
-    - 10
-----
-====
-
-`max-pods` sets the number of pods the node can run to a fixed value, regardless
-of the properties of the node.
-
-====
-----
-kubeletArguments:
-  max-pods:
-    - 250
-----
-====
-
-The default value for `pods-per-core` is `10` and the default value for `max-pods` is `250`.
-This means that unless the node has 25 cores or more, by default, `pods-per-core` will be
-the limiting factor.
-
 [[enforcing-cpu-limits]]
 === Enforcing CPU Limits