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/k8s-ha-contrail/kubernetes/compute.yml

diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
index e3b8396..1b51aa8 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/compute.yml
@@ -36,6 +36,7 @@
     pool:
       kubelet:
         address: ${_param:single_address}
+        fail_on_swap: ${_param:kubelet_fail_on_swap}
       network:
         engine: opencontrail
         config:

classes/cluster/k8s-ha-contrail/kubernetes/control.yml

diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
index 08760e2..012a0d0 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/control.yml
@@ -54,6 +54,7 @@
     master:
       kubelet:
         address: ${_param:single_address}
+        fail_on_swap: ${_param:kubelet_fail_on_swap}
       etcd:
         ssl:
           enabled: true

classes/cluster/k8s-ha-contrail/kubernetes/init.yml

diff --git a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
index 822401b..ec8e4de 100644
--- a/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-contrail/kubernetes/init.yml
@@ -4,6 +4,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