commit aabffb6601991a3e7faf906061caec9958174fcd
author Andrey Shestakov <ashestakov@mirantis.com> Tue Nov 13 17:11:10 2018 +0200
committer Victor Ryzhenkin <vryzhenkin@mirantis.com> Tue Dec 18 19:06:49 2018 +0000
tree eb3ea1123ab60c357d811e25146a61a7715d49d0
parent ec27ccbde1c4474c56631cbf963272977fcd0ecd

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

classes/cluster/k8s-ha-contrail-40/kubernetes/compute.yml

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: