commit e048a839e5d62dab349a5cf20fc9c2886add175f
author Martin Polreich <polreichmartin@gmail.com> Wed Aug 16 14:33:46 2017 +0200
committer Martin Polreich <polreichmartin@gmail.com> Wed Aug 16 14:33:46 2017 +0200
tree b4b04ef23cab55d2d0d48138d2d9b590ab44d63d
parent 5fe354f9a4dbb259e71855de7434c9288d389aaf

Update sl_k8s_calico models

Change-Id: I89bcf21ed3139110106d6bd3ffe8d30a61dbe553

classes/cluster/sl_k8s_calico/kubernetes/init.yml

diff --git a/classes/cluster/sl_k8s_calico/kubernetes/init.yml b/classes/cluster/sl_k8s_calico/kubernetes/init.yml
index 307ebd0..7b7f819 100644
--- a/classes/cluster/sl_k8s_calico/kubernetes/init.yml
+++ b/classes/cluster/sl_k8s_calico/kubernetes/init.yml
@@ -12,8 +12,27 @@
     kubernetes_scheduler_token: VgkUHfrW07zNxrb0ucFyX7NBnSJN9Xp6
     kubernetes_controller-manager_token: uXrdZ1YKF6qlYm3sHje2iEXMGAGDWOIU
     kubernetes_dns_token: 0S1I4iJeFjq5fopPwwCwTp3xFpEZfeUl
+    kubernetes_mtu: 1500
     etcd_initial_token: IN7KaRMSo3xkGxkjAAPtkRkAgqN4ZNRq
 
+    # docker package version
+    kubernetes_docker_package: docker-engine=1.12.6-0~ubuntu-xenial
+
+    # component docker images
+    kubernetes_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
+    kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
+    kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
+    kubernetes_calico_policy_image: calico/kube-policy-controller:v0.5.4
+    kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2
+    kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:v1.1.0
+    kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:v1.1.0
+    kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
+
+    # switches of addons
+    kubernetes_helm_enabled: true
+    kubernetes_netchecker_enabled: true
+    kubernetes_calico_policy_enabled: false
+
     # addresses and hostnames
     kubernetes_internal_api_address: 10.254.0.1
     kubernetes_control_hostname: ctl
@@ -51,6 +70,12 @@
 
   linux:
     network:
+      resolv:
+        domain: sl_k8s_calico.local
+        options:
+          - ndots:5
+          - timeout:2
+          - attempts:2
       host:
         ctl:
           address: ${_param:kubernetes_control_address}
@@ -88,6 +113,10 @@
           - ${_param:kubernetes_proxy_node01_hostname}
           - ${_param:kubernetes_proxy_node01_hostname}.${_param:cluster_domain}
     system:
+      user:
+        root:
+          name: root
+          password: false
       rc:
         local: |
           #!/bin/sh -e
@@ -99,5 +128,5 @@
           # Make sure that the script will "exit 0" on success or any other
           # value on error.
           #
-          ip r a 10.254.0.0/16 dev ens3
+          ip r a 10.254.0.0/16 dev ens4
           exit 0