From 2a04ab183da19c7058f8332e214d5124ef97379d Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Wed, 31 Jul 2019 13:32:01 +0400 Subject: [k8s] Adjust scenario for bionic Change-Id: I5c7a1e827446189b98b924ffd4272acf1a794697 Signed-off-by: Michael Polenchuk --- .../classes/cluster/mcp-k8s-calico-noha/kubernetes/common.yml.j2 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'mcp/reclass/classes/cluster/mcp-k8s-calico-noha/kubernetes') diff --git a/mcp/reclass/classes/cluster/mcp-k8s-calico-noha/kubernetes/common.yml.j2 b/mcp/reclass/classes/cluster/mcp-k8s-calico-noha/kubernetes/common.yml.j2 index 4367d318c..bd6e48fce 100644 --- a/mcp/reclass/classes/cluster/mcp-k8s-calico-noha/kubernetes/common.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-k8s-calico-noha/kubernetes/common.yml.j2 @@ -8,15 +8,14 @@ {%- import 'net_map.j2' as nm with context %} --- classes: - - system.linux.system.repo.mcp.apt_mirantis.docker - - system.linux.system.repo.mcp.apt_mirantis.update.docker - - system.linux.system.repo.mcp.apt_mirantis.kubernetes_extra - - system.linux.system.repo.mcp.apt_mirantis.update.kubernetes_extra - system.kubernetes.pool.single - system.salt.minion.cert.k8s_client_single - system.salt.minion.cert.etcd_client_single + - cluster.all-mcp-arch-common.backports - cluster.mcp-common-noha.openstack_compute_pdf parameters: + _param: + kubernetes_containerd_package: containerd kubernetes: common: hyperkube: -- cgit 1.2.3-korg