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/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: