moving virtual labs to new templates && system update

Change-Id: I713b73cbfe1a8f168dfd6dcaf5fd4ec34df47758
diff --git a/classes/cluster/virtual-mcp10-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp10-dvr/openstack/compute.yml
index 43d3ab7..e25f34d 100644
--- a/classes/cluster/virtual-mcp10-dvr/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp10-dvr/openstack/compute.yml
@@ -2,6 +2,7 @@
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
+- system.linux.network.hosts
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
 - system.linux.network.interface.single_ovs_dvr
diff --git a/classes/cluster/virtual-mcp10-dvr/openstack/init.yml b/classes/cluster/virtual-mcp10-dvr/openstack/init.yml
index f5683a3..45767fb 100644
--- a/classes/cluster/virtual-mcp10-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp10-dvr/openstack/init.yml
@@ -120,13 +120,4 @@
           names:
           - gtw01
           - gtw01.${_param:cluster_domain}
-        cmp01:
-          address: 172.16.10.105
-          names:
-          - cmp01
-          - cmp01.${_param:cluster_domain}
-        cmp02:
-          address: 172.16.10.106
-          names:
-          - cmp02
-          - cmp02.${_param:cluster_domain}
+