diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-10-07 09:18:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-07 09:18:32 -0400 |
| commit | 78d19f8a64784f693ffae5583080ba2e127cd1ba (patch) | |
| tree | 7d9ae1f1d4e5b28a761793c2c338df76b5214796 | |
| parent | 7a5cd4a48e586bd05f10af2787e44d585793c120 (diff) | |
| parent | f45b50a3cfe89fd93b9614598c806060a0e282a4 (diff) | |
| download | openshift-78d19f8a64784f693ffae5583080ba2e127cd1ba.tar.gz openshift-78d19f8a64784f693ffae5583080ba2e127cd1ba.tar.bz2 openshift-78d19f8a64784f693ffae5583080ba2e127cd1ba.tar.xz openshift-78d19f8a64784f693ffae5583080ba2e127cd1ba.zip | |
Merge pull request #2424 from jeremyeder/pods_per_core2
the kubelet example line fails on releases prior to 3.3, so put a comment there.
| -rw-r--r-- | inventory/byo/hosts.origin.example | 2 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index 397fc3dbd..706dd8080 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -552,7 +552,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # Configure dnsIP in the node config #openshift_dns_ip=172.30.0.1 -# Configure node kubelet arguments +# Configure node kubelet arguments. pods-per-core is valid in OpenShift Origin 1.3 or OpenShift Container Platform 3.3 and later. #openshift_node_kubelet_args={'pods-per-core': ['10'], 'max-pods': ['250'], 'image-gc-high-threshold': ['90'], 'image-gc-low-threshold': ['80']} # Configure logrotate scripts diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index cbd2440c7..09f1350b1 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -552,7 +552,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # Configure dnsIP in the node config #openshift_dns_ip=172.30.0.1 -# Configure node kubelet arguments +# Configure node kubelet arguments. pods-per-core is valid in OpenShift Origin 1.3 or OpenShift Container Platform 3.3 and later. #openshift_node_kubelet_args={'pods-per-core': ['10'], 'max-pods': ['250'], 'image-gc-high-threshold': ['90'], 'image-gc-low-threshold': ['80']} # Configure logrotate scripts |