Remove docker-related definitions from k8s models.
Docker was replaced by containerd, so cleanup docker things from models.
Related story: PROD-24676
Change-Id: I9e9bb5162602697dcecf24ac4519eecdf4a84521
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml
index a27bde9..9a96298 100644
--- a/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml
@@ -1,5 +1,5 @@
classes:
-- system.linux.system.repo.docker_legacy
+- system.linux.system.repo.docker
- system.kubernetes.pool.cluster
- system.linux.network.hosts
- system.salt.minion.cert.k8s_client
@@ -27,10 +27,6 @@
- /usr/lib/contrail/if-vhost0
use_interfaces:
- ens4
- docker:
- host:
- options:
- bip: 172.31.255.1/24
kubernetes:
pool:
kubelet:
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
index 3d55a35..29b9565 100644
--- a/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/control.yml
@@ -2,7 +2,7 @@
- system.etcd.server.cluster
- service.kubernetes.control.cluster
- system.haproxy.proxy.listen.kubernetes.apiserver
-- system.linux.system.repo.docker_legacy
+- system.linux.system.repo.docker
- system.kubernetes.pool.cluster
- system.salt.minion.cert.k8s_client
- system.salt.minion.cert.etcd_client
@@ -41,10 +41,6 @@
engine: docker_hybrid
ssl:
enabled: true
- docker:
- host:
- options:
- bip: 172.31.255.1/24
kubernetes:
pool:
kubelet:
diff --git a/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml b/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml
index 1ea0664..cb74376 100644
--- a/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-contrail-40/kubernetes/init.yml
@@ -21,7 +21,6 @@
etcd_initial_token: IN7KaRMSo3xkGxkjAAPtkRkAgqN4ZNRq
# component docker images
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.10-8
kubernetes_virtlet_image: mirantis/virtlet:v1.0.2
kubernetes_criproxy_version: v0.10.0
kubernetes_criproxy_checksum: md5=52717b1f70f15558ef4bdb0e4d4948da