Sync sl-k8s-calico model with virtual-mcp11-k8s-calico
Change-Id: Ie3ac2560746f33a6d02a44baeaa8175dadff25b7
diff --git a/classes/cluster/sl-k8s-calico/kubernetes/compute.yml b/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
index ac2f555..3522796 100644
--- a/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
+++ b/classes/cluster/sl-k8s-calico/kubernetes/compute.yml
@@ -1,33 +1,43 @@
classes:
-- system.linux.system.repo.docker_legacy
+- system.linux.system.repo.mcp.apt_mirantis.docker_legacy
- system.kubernetes.pool.cluster
-- system.linux.network.hosts
- system.salt.minion.cert.k8s_client
- system.salt.minion.cert.etcd_client
- cluster.sl-k8s-calico
parameters:
- _param:
- kubernetes_calico_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_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.6-5
docker:
host:
pkgs:
- - docker-engine=1.12.6-0~ubuntu-xenial
+ - ${_param:kubernetes_docker_package}
- python-docker
+ options:
+ bip: 172.31.255.1/24
+ storage-driver: overlay2
kubernetes:
pool:
+ kubelet:
+ fail_on_swap: ${_param:kubelet_fail_on_swap}
network:
calico:
enabled: true
image: ${_param:kubernetes_calico_image}
calicoctl_image: ${_param:kubernetes_calico_calicoctl_image}
cni_image: ${_param:kubernetes_calico_cni_image}
+ mtu: ${_param:kubernetes_mtu}
etcd:
ssl:
enabled: true
common:
+ addons:
+ virtlet:
+ enabled: ${_param:kubernetes_virtlet_enabled}
+ namespace: kube-system
+ image: ${_param:kubernetes_virtlet_image}
+ criproxy_version: ${_param:kubernetes_criproxy_version}
+ criproxy_source: ${_param:kubernetes_criproxy_checksum}
+ hosts:
+ - ${_param:kubernetes_compute_node01_hostname}
+ - ${_param:kubernetes_compute_node02_hostname}
hyperkube:
image: ${_param:kubernetes_hyperkube_image}
linux:
@@ -37,15 +47,23 @@
- 10.254.0.10
- 172.18.176.4
- 172.18.176.7
- domain: virtual-mcp11-k8s-calico.local
- options:
- - ndots:5
- - timeout:2
- - attempts:2
interface:
- primary_interface:
+ ens3:
+ enabled: true
+ type: eth
+ proto: static
+ name: ${_param:primary_interface}
+ address: ${_param:deploy_address}
+ netmask: 255.255.255.0
+ gateway: 192.168.10.1
route:
kubernetes_services:
address: 10.254.0.0
netmask: 255.255.0.0
- gateway: ${_param:single_address}
+ gateway: ${_param:deploy_address}
+ ens4:
+ enabled: true
+ type: eth
+ proto: static
+ address: ${_param:single_address}
+ netmask: '255.255.255.0'