refactoring of mcp repositories

Change-Id: I6cb3bd7fc2a983d83b0e11d4262fad24a1037cc2
diff --git a/classes/cluster/virtual-mcp10-contrail/openstack/compute.yml b/classes/cluster/virtual-mcp10-contrail/openstack/compute.yml
index 2262899..8c50b04 100755
--- a/classes/cluster/virtual-mcp10-contrail/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp10-contrail/openstack/compute.yml
@@ -1,7 +1,8 @@
 classes:
-- system.linux.system.repo.mcp_contrail
-#- system.linux.system.repo.mos9
-- system.linux.system.repo.mcp10
+- system.linux.system.repo.mcp.contrail
+- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.extra
+- system.linux.system.repo.saltstack.xenial
 - system.nova.compute.cluster
 - system.opencontrail.compute.cluster
 - system.heka.alarm.openstack_compute