diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/init.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/init.yml
index bbe3cbe..f3f2d2a 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/init.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.defaults
 - system.linux.network.dynamic_hosts
 - cluster.k8s-ha-calico-flannel-virtlet.kubernetes
 - cluster.k8s-ha-calico-flannel-virtlet.infra
diff --git a/classes/cluster/k8s-ha-calico/init.yml b/classes/cluster/k8s-ha-calico/init.yml
index f98b325..148f88e 100644
--- a/classes/cluster/k8s-ha-calico/init.yml
+++ b/classes/cluster/k8s-ha-calico/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.defaults
 - system.linux.network.dynamic_hosts
 - cluster.k8s-ha-calico.kubernetes
 - cluster.k8s-ha-calico.infra
diff --git a/classes/cluster/k8s-ha-contrail-40/init.yml b/classes/cluster/k8s-ha-contrail-40/init.yml
index e70398c..f0ad1aa 100644
--- a/classes/cluster/k8s-ha-contrail-40/init.yml
+++ b/classes/cluster/k8s-ha-contrail-40/init.yml
@@ -1,3 +1,5 @@
+classes:
+- system.defaults
 parameters:
   _param:
     cluster_name: k8s-ha-contrail-40
diff --git a/classes/cluster/k8s-ha-contrail/init.yml b/classes/cluster/k8s-ha-contrail/init.yml
index 27f4ed5..bcb860b 100644
--- a/classes/cluster/k8s-ha-contrail/init.yml
+++ b/classes/cluster/k8s-ha-contrail/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.defaults
 - system.linux.network.dynamic_hosts
 - system.linux.system.repo.mcp.extra
 - system.linux.system.single
diff --git a/classes/cluster/os-ha-contrail-40/init.yml b/classes/cluster/os-ha-contrail-40/init.yml
index 707e8d6..5ad24b3 100644
--- a/classes/cluster/os-ha-contrail-40/init.yml
+++ b/classes/cluster/os-ha-contrail-40/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.defaults
 - system.linux.network.dynamic_hosts
 - system.linux.system.repo.mcp.extra
 - system.linux.system.single
diff --git a/classes/cluster/os-ha-contrail-40/openstack/compute.yml b/classes/cluster/os-ha-contrail-40/openstack/compute.yml
index b30902b..4dc427e 100644
--- a/classes/cluster/os-ha-contrail-40/openstack/compute.yml
+++ b/classes/cluster/os-ha-contrail-40/openstack/compute.yml
@@ -66,6 +66,7 @@
         topics: "notifications"
         notify_on:
           state_change: vm_and_task_state
+      networking: contrail
   opencontrail:
     common:
       network:
diff --git a/classes/cluster/os-ha-contrail/init.yml b/classes/cluster/os-ha-contrail/init.yml
index 877e684..84be2b6 100755
--- a/classes/cluster/os-ha-contrail/init.yml
+++ b/classes/cluster/os-ha-contrail/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.defaults
 - system.linux.network.dynamic_hosts
 - system.linux.system.repo.mcp.extra
 - system.linux.system.single
diff --git a/classes/cluster/os-ha-contrail/opencontrail/control.yml b/classes/cluster/os-ha-contrail/opencontrail/control.yml
index 3369749..4dff206 100644
--- a/classes/cluster/os-ha-contrail/opencontrail/control.yml
+++ b/classes/cluster/os-ha-contrail/opencontrail/control.yml
@@ -59,6 +59,9 @@
         host: ${_param:openstack_control_address}
       identity:
         host: ${_param:openstack_control_address}
+    collector:
+      identity:
+        host: ${_param:openstack_control_address}
     config:
       network:
         host: ${_param:openstack_control_address}
diff --git a/classes/cluster/os-ha-contrail/openstack/compute.yml b/classes/cluster/os-ha-contrail/openstack/compute.yml
index 1d2b5e0..0467c74 100755
--- a/classes/cluster/os-ha-contrail/openstack/compute.yml
+++ b/classes/cluster/os-ha-contrail/openstack/compute.yml
@@ -68,6 +68,7 @@
         topics: "notifications"
         notify_on:
           state_change: vm_and_task_state
+      networking: contrail
   opencontrail:
     common:
       network:
diff --git a/classes/cluster/sl-k8s-calico/init.yml b/classes/cluster/sl-k8s-calico/init.yml
index 55ea734..35bfe18 100644
--- a/classes/cluster/sl-k8s-calico/init.yml
+++ b/classes/cluster/sl-k8s-calico/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.defaults
 - system.linux.network.dynamic_hosts
 - system.fluentd
 - system.fluentd.label.default_metric
diff --git a/classes/cluster/sl-k8s-contrail/init.yml b/classes/cluster/sl-k8s-contrail/init.yml
index 2e194af..02a6712 100644
--- a/classes/cluster/sl-k8s-contrail/init.yml
+++ b/classes/cluster/sl-k8s-contrail/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.defaults
 - system.linux.network.dynamic_hosts
 - system.linux.system.single
 - cluster.sl-k8s-contrail.kubernetes
diff --git a/classes/cluster/sl-os-contrail/init.yml b/classes/cluster/sl-os-contrail/init.yml
index dc46bda..6eefe54 100755
--- a/classes/cluster/sl-os-contrail/init.yml
+++ b/classes/cluster/sl-os-contrail/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.defaults
 - system.linux.network.dynamic_hosts
 - service.grafana.collector
 - system.fluentd
diff --git a/classes/cluster/sl-os-contrail/openstack/compute.yml b/classes/cluster/sl-os-contrail/openstack/compute.yml
index c523b7c..0da8728 100755
--- a/classes/cluster/sl-os-contrail/openstack/compute.yml
+++ b/classes/cluster/sl-os-contrail/openstack/compute.yml
@@ -59,6 +59,7 @@
         topics: "notifications,${_param:stacklight_notification_topic}"
         notify_on:
           state_change: vm_and_task_state
+      networking: contrail
   ceilometer:
     agent:
       message_queue:
diff --git a/classes/cluster/sl-os-ovs/init.yml b/classes/cluster/sl-os-ovs/init.yml
index bbd135b..248707b 100644
--- a/classes/cluster/sl-os-ovs/init.yml
+++ b/classes/cluster/sl-os-ovs/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.defaults
 - system.linux.network.dynamic_hosts
 - system.linux.system.single
 - system.openssh.server.team.lab
diff --git a/classes/cluster/sl-pike-dvr/init.yml b/classes/cluster/sl-pike-dvr/init.yml
index ec92997..a91529e 100644
--- a/classes/cluster/sl-pike-dvr/init.yml
+++ b/classes/cluster/sl-pike-dvr/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.defaults
 - system.linux.network.dynamic_hosts
 - service.grafana.collector
 - system.fluentd
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/init.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/init.yml
index 3593d3b..3f402da 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/init.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.defaults
 - system.linux.network.dynamic_hosts
 - service.grafana.collector
 - system.fluentd
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/init.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/init.yml
index 4312c7d..f2d6c97 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/init.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.defaults
 - system.linux.network.dynamic_hosts
 - service.grafana.collector
 - system.fluentd
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/init.yml
index 1db0cfa..2f1a5ec 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.defaults
 - system.linux.network.dynamic_hosts
 - system.linux.system.repo.mcp.extra
 - system.linux.system.single
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/init.yml
index 5fcfe30..b3ef31b 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.defaults
 - system.linux.network.dynamic_hosts
 - system.linux.system.repo.mcp.extra
 - system.linux.system.single
diff --git a/classes/cluster/virtual-mcp-pike-dvr/init.yml b/classes/cluster/virtual-mcp-pike-dvr/init.yml
index b3e79c6..2091aa7 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.defaults
 - system.linux.network.dynamic_hosts
 - system.linux.system.repo.mcp.extra
 - system.linux.system.single
diff --git a/classes/cluster/virtual-mcp-pike-ovs/init.yml b/classes/cluster/virtual-mcp-pike-ovs/init.yml
index 6cc8a27..49212bc 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/init.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.defaults
 - system.linux.network.dynamic_hosts
 - system.linux.system.repo.mcp.extra
 - system.linux.system.single
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/init.yml
index 1f8d779..7ba08cd 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.defaults
 - service.grafana.collector
 - system.linux.network.dynamic_hosts
 - system.linux.system.single
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/init.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/init.yml
index da495f8..c0759e7 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/infra/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.defaults
 - system.linux.network.dynamic_hosts
 - system.linux.system.repo_local.mcp.extra
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
diff --git a/classes/cluster/virtual-offline-pike-ovs/init.yml b/classes/cluster/virtual-offline-pike-ovs/init.yml
index 8c5b321..edbbe4d 100644
--- a/classes/cluster/virtual-offline-pike-ovs/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.defaults
 - system.linux.network.dynamic_hosts
 - service.grafana.collector
 - system.heka.log_collector.single
diff --git a/classes/cluster/virtual-offline-ssl/init.yml b/classes/cluster/virtual-offline-ssl/init.yml
index cbbe7e6..982c5cc 100644
--- a/classes/cluster/virtual-offline-ssl/init.yml
+++ b/classes/cluster/virtual-offline-ssl/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.defaults
 - system.linux.network.dynamic_hosts
 - system.linux.system.repo_local.mcp.extra
 - system.linux.system.repo.mcp.apt_mirantis.saltstack