commit c11c1b558fc2e501d39f04120932c0da57318b48
author Tatyana Leontovich <tleontovich@mirantis.com> Fri Jan 26 13:58:39 2018 +0200
committer Tatyana Leontovich <tleontovich@mirantis.com> Fri Jan 26 14:08:53 2018 +0200
tree 00fbd82efaaaf822d632a722b4d5ed5c4e86202f
parent 2e5f334f26c5a5ae280e1e73a6c1ec203ca88206

Move virtual-k8s-calico on new repo usage

Align system.repo includes with new ones introduced by build_id feature

Change-Id: I1822f1bcb1dae5bdea5f7a037b4b1b460460ed98

classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml

diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
index de242e8..b4eee22 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/compute.yml
@@ -1,5 +1,5 @@
 classes:
-- system.linux.system.repo.docker_legacy
+- system.linux.system.repo.mcp.apt_mirantis.docker_legacy
 - system.kubernetes.pool.cluster
 - system.salt.minion.cert.k8s_client
 - system.salt.minion.cert.etcd_client

classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml

diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
index 96120d8..9ba031c 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
@@ -1,7 +1,7 @@
 classes:
 - service.etcd.server.cluster
 - system.haproxy.proxy.listen.kubernetes.apiserver
-- system.linux.system.repo.docker_legacy
+- system.linux.system.repo.mcp.apt_mirantis.docker_legacy
 - system.salt.minion.cert.etcd_server
 - system.kubernetes.master.cluster
 - cluster.virtual-mcp11-k8s-calico.kubernetes.compute

classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml

diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
index 2c297a0..8736a3d 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
@@ -16,6 +16,7 @@
     kubernetes_controller-manager_token: uXrdZ1YKF6qlYm3sHje2iEXMGAGDWOIU
     kubernetes_dns_token: 0S1I4iJeFjq5fopPwwCwTp3xFpEZfeUl
     kubernetes_mtu: 1500
+    mcp_version: testing
     etcd_initial_token: IN7KaRMSo3xkGxkjAAPtkRkAgqN4ZNRq
 
     # docker package version