commit 03e5840388b646b58d7027096bb8a7ba37b633d7
author Victor Ryzhenkin <vryzhenkin@mirantis.com> Tue Dec 12 16:46:05 2017 +0400
committer Victor Ryzhenkin <vryzhenkin@mirantis.com> Thu Dec 14 14:04:06 2017 +0000
tree 232967f97c723755cd22db3e6ffc135da3f1e6ac
parent 38364bfdf1b117714bb1d7766ce27d44f295e40d

Make fail_on_swap for kubelet configurable

Affected models:
- k8s-ha-calico
- k8s-ha-contrail
- virtual-mcp11-k8s-calico
- virtual-mcp11-k8s-contrail

Change-Id: I7d3a7cd606622bcf71683ce36f7ebf7dad3cae58

classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml

diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
index 405b75a..2c58c3d 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
@@ -12,6 +12,8 @@
         - python-docker
   kubernetes:
     pool:
+      kubelet:
+        fail_on_swap: ${_param:kubelet_fail_on_swap}
       network:
         etcd:
           ssl:

classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml

diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
index 49c80d5..96120d8 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
@@ -40,6 +40,8 @@
           image: ${_param:kubernetes_externaldns_image}
           provider: ${_param:kubernetes_externaldns_provider}
     master:
+      kubelet:
+        fail_on_swap: ${_param:kubelet_fail_on_swap}
       etcd:
         ssl:
           enabled: true

classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml

diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
index ea70dcc..d3f4430 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
@@ -3,6 +3,9 @@
     salt_minion_ca_host: ${_param:infra_config_hostname}.${_param:cluster_domain}
     salt_minion_ca_authority: salt_master_ca
 
+    # kubelet
+    kubelet_fail_on_swap: True
+
     # kubernetes settings
     kubernetes_admin_user: admin
     kubernetes_admin_password: sbPfel23ZigJF3Bm