| commit | 03e5840388b646b58d7027096bb8a7ba37b633d7 | [log] [tgz] |
|---|---|---|
| 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 [diff] |
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
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml index a73a57b..ea131dd 100644 --- a/classes/cluster/k8s-ha-calico/kubernetes/compute.yml +++ b/classes/cluster/k8s-ha-calico/kubernetes/compute.yml
@@ -18,6 +18,7 @@ pool: kubelet: address: ${_param:single_address} + fail_on_swap: ${_param:kubelet_fail_on_swap} network: etcd: ssl:
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/control.yml b/classes/cluster/k8s-ha-calico/kubernetes/control.yml index 1b88da8..ab43539 100644 --- a/classes/cluster/k8s-ha-calico/kubernetes/control.yml +++ b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
@@ -68,6 +68,7 @@ master: kubelet: address: ${_param:single_address} + fail_on_swap: ${_param:kubelet_fail_on_swap} etcd: ssl: enabled: true
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/init.yml b/classes/cluster/k8s-ha-calico/kubernetes/init.yml index c669373..1336dde 100644 --- a/classes/cluster/k8s-ha-calico/kubernetes/init.yml +++ b/classes/cluster/k8s-ha-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