diff --git a/classes/cluster/aaa-ha-freeipa/infra/config.yml b/classes/cluster/aaa-ha-freeipa/infra/config.yml
index c24f8ae..e69242a 100644
--- a/classes/cluster/aaa-ha-freeipa/infra/config.yml
+++ b/classes/cluster/aaa-ha-freeipa/infra/config.yml
@@ -23,10 +23,10 @@
     salt_master_host: 127.0.0.1
   salt:
     master:
-      enabled: true
       reactor:
         reclass/minion/classify:
         - salt://reclass/reactor/node_register.sls
+
   reclass:
     storage:
       class_mapping:
diff --git a/classes/cluster/aaa-ha-freeipa/infra/idm.yml b/classes/cluster/aaa-ha-freeipa/infra/idm.yml
new file mode 100644
index 0000000..95f6f6b
--- /dev/null
+++ b/classes/cluster/aaa-ha-freeipa/infra/idm.yml
@@ -0,0 +1,2 @@
+classes:
+- cluster.aaa-ha-freeipa.infra
diff --git a/classes/cluster/aaa-ha-freeipa/infra/prx.yml b/classes/cluster/aaa-ha-freeipa/infra/prx.yml
new file mode 100644
index 0000000..95f6f6b
--- /dev/null
+++ b/classes/cluster/aaa-ha-freeipa/infra/prx.yml
@@ -0,0 +1,2 @@
+classes:
+- cluster.aaa-ha-freeipa.infra
diff --git a/classes/cluster/aaa-ha-freeipa/init.yml b/classes/cluster/aaa-ha-freeipa/init.yml
index 5c821d9..5dfab8e 100644
--- a/classes/cluster/aaa-ha-freeipa/init.yml
+++ b/classes/cluster/aaa-ha-freeipa/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - cluster.aaa-ha-freeipa.aaa.freeipa_server
 - cluster.aaa-ha-freeipa.infra
 - cluster.overrides
diff --git a/classes/cluster/drivetrain-ha-clusters/cicd/control/master.yml b/classes/cluster/drivetrain-ha-clusters/cicd/control/master.yml
index 13f8c2f..dadabbb 100644
--- a/classes/cluster/drivetrain-ha-clusters/cicd/control/master.yml
+++ b/classes/cluster/drivetrain-ha-clusters/cicd/control/master.yml
@@ -16,7 +16,7 @@
   # ..jobs
   - system.jenkins.client.job.aptly
   - system.jenkins.client.job.git-mirrors.downstream.pipelines
-  - system.jenkins.client.job.deploy.lab.mk.physical
+  - system.jenkins.client.job.deploy.lab.release.mcp10
   - system.jenkins.client.job.deploy.update.package
   - system.jenkins.client.job.deploy.update.config
   # Gerrit
diff --git a/classes/cluster/drivetrain-ha-clusters/init.yml b/classes/cluster/drivetrain-ha-clusters/init.yml
index e3a898b..634ecc6 100644
--- a/classes/cluster/drivetrain-ha-clusters/init.yml
+++ b/classes/cluster/drivetrain-ha-clusters/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - cluster.drivetrain-ha-clusters.infra
 - cluster.drivetrain-ha-clusters.cicd
 - cluster.overrides
diff --git a/classes/cluster/drivetrain-ha/cicd/control/master.yml b/classes/cluster/drivetrain-ha/cicd/control/master.yml
index 2968ea9..3a84699 100644
--- a/classes/cluster/drivetrain-ha/cicd/control/master.yml
+++ b/classes/cluster/drivetrain-ha/cicd/control/master.yml
@@ -16,7 +16,7 @@
   # ..jobs
   - system.jenkins.client.job.aptly
   - system.jenkins.client.job.git-mirrors.downstream.pipelines
-  - system.jenkins.client.job.deploy.lab.mk.physical
+  - system.jenkins.client.job.deploy.lab.release.mcp10
   - system.jenkins.client.job.deploy.update.package
   - system.jenkins.client.job.deploy.update.config
   # Gerrit
diff --git a/classes/cluster/drivetrain-ha/init.yml b/classes/cluster/drivetrain-ha/init.yml
index dcf60af..fa0c93c 100644
--- a/classes/cluster/drivetrain-ha/init.yml
+++ b/classes/cluster/drivetrain-ha/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - cluster.drivetrain-ha.cicd.control
 - cluster.drivetrain-ha.infra
 #- cluster.drivetrain-ha.cicd
diff --git a/classes/cluster/k8s-aio-calico/init.yml b/classes/cluster/k8s-aio-calico/init.yml
index e0b6c40..190a1db 100644
--- a/classes/cluster/k8s-aio-calico/init.yml
+++ b/classes/cluster/k8s-aio-calico/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - cluster.k8s-aio-calico.kubernetes
 - cluster.k8s-aio-calico.infra
 - cluster.overrides
diff --git a/classes/cluster/k8s-aio-contrail/init.yml b/classes/cluster/k8s-aio-contrail/init.yml
index 2022387..49eadbc 100644
--- a/classes/cluster/k8s-aio-contrail/init.yml
+++ b/classes/cluster/k8s-aio-contrail/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - cluster.k8s-aio-contrail.kubernetes
 - cluster.k8s-aio-contrail.opencontrail
 - cluster.k8s-aio-contrail.infra
diff --git a/classes/cluster/k8s-ha-calico-syndic/init.yml b/classes/cluster/k8s-ha-calico-syndic/init.yml
index bf509c9..11a3633 100644
--- a/classes/cluster/k8s-ha-calico-syndic/init.yml
+++ b/classes/cluster/k8s-ha-calico-syndic/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - cluster.k8s-ha-calico-syndic.kubernetes
 - cluster.k8s-ha-calico-syndic.infra
 - cluster.overrides
diff --git a/classes/cluster/k8s-ha-calico/init.yml b/classes/cluster/k8s-ha-calico/init.yml
index 9bab6cd..f98b325 100644
--- a/classes/cluster/k8s-ha-calico/init.yml
+++ b/classes/cluster/k8s-ha-calico/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - cluster.k8s-ha-calico.kubernetes
 - cluster.k8s-ha-calico.infra
 - cluster.overrides
diff --git a/classes/cluster/k8s-ha-contrail/init.yml b/classes/cluster/k8s-ha-contrail/init.yml
index d36ddde..ee4126e 100644
--- a/classes/cluster/k8s-ha-contrail/init.yml
+++ b/classes/cluster/k8s-ha-contrail/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - system.linux.system.single
 - cluster.k8s-ha-contrail.kubernetes
 - cluster.k8s-ha-contrail.opencontrail
diff --git a/classes/cluster/model-manager/init.yml b/classes/cluster/model-manager/init.yml
index 8a17052..f7119c9 100644
--- a/classes/cluster/model-manager/init.yml
+++ b/classes/cluster/model-manager/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - system.linux.system.single
 - system.openssh.server.team.lab
 - system.openssh.server.team.tcpcloud
diff --git a/classes/cluster/os-aio-contrail/init.yml b/classes/cluster/os-aio-contrail/init.yml
index eb4af4a..05aab3a 100755
--- a/classes/cluster/os-aio-contrail/init.yml
+++ b/classes/cluster/os-aio-contrail/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - system.linux.system.repo.mcp.extra
 - system.linux.system.single
 - system.rsyslog.client.single
diff --git a/classes/cluster/os-aio-ovs/init.yml b/classes/cluster/os-aio-ovs/init.yml
index c2785b7..7ba75cc 100644
--- a/classes/cluster/os-aio-ovs/init.yml
+++ b/classes/cluster/os-aio-ovs/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - system.linux.system.single
 - cluster.os-aio-ovs.infra
 - cluster.os-aio-ovs.openstack
diff --git a/classes/cluster/os-ha-contrail-40/init.yml b/classes/cluster/os-ha-contrail-40/init.yml
index b7c1997..7947dac 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.linux.network.dynamic_hosts
 - system.linux.system.repo.mcp.extra
 - system.linux.system.single
 - system.rsyslog.client.single
diff --git a/classes/cluster/os-ha-contrail/infra/config.yml b/classes/cluster/os-ha-contrail/infra/config.yml
index 28d7e3b..3fec3ee 100755
--- a/classes/cluster/os-ha-contrail/infra/config.yml
+++ b/classes/cluster/os-ha-contrail/infra/config.yml
@@ -10,10 +10,11 @@
 - system.salt.minion.cert.proxy
 - system.sphinx.server.doc.reclass
 - system.keystone.client.core
-- system.keystone.client.service.designate
+- system.keystone.client.service.barbican
 - system.keystone.client.service.cinder
 - system.keystone.client.service.cinder2
 - system.keystone.client.service.cinder3
+- system.keystone.client.service.designate
 - system.keystone.client.service.glance
 - system.keystone.client.service.glare
 - system.keystone.client.service.heat
@@ -24,6 +25,7 @@
 - system.keystone.client.service.nova21
 - system.keystone.client.service.nova-placement
 - system.mysql.client
+- system.mysql.client.database.barbican
 - system.mysql.client.database.cinder
 - system.mysql.client.database.glance
 - system.mysql.client.database.heat
diff --git a/classes/cluster/os-ha-contrail/init.yml b/classes/cluster/os-ha-contrail/init.yml
index 5e876d7..8502db0 100755
--- a/classes/cluster/os-ha-contrail/init.yml
+++ b/classes/cluster/os-ha-contrail/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - system.linux.system.repo.mcp.extra
 - system.linux.system.single
 - system.rsyslog.client.single
@@ -9,3 +10,8 @@
 - cluster.os-ha-contrail.opencontrail
 - cluster.os-ha-contrail.openstack
 - cluster.overrides
+parameters:
+  salt:
+    minion:
+      trusted_ca_minions:
+        - cfg01
diff --git a/classes/cluster/os-ha-contrail/opencontrail/control.yml b/classes/cluster/os-ha-contrail/opencontrail/control.yml
index a281452..4c03393 100644
--- a/classes/cluster/os-ha-contrail/opencontrail/control.yml
+++ b/classes/cluster/os-ha-contrail/opencontrail/control.yml
@@ -12,6 +12,7 @@
 - system.opencontrail.client.resource.config_node
 - system.opencontrail.client.resource.database_node
 - system.opencontrail.client.resource.analytics_node
+- system.opencontrail.client.resource.openstack_metadata
 - system.haproxy.proxy.listen.opencontrail.analytics
 - cluster.os-ha-contrail
 parameters:
diff --git a/classes/cluster/os-ha-contrail/openstack/compute.yml b/classes/cluster/os-ha-contrail/openstack/compute.yml
index f32f983..8346f2f 100755
--- a/classes/cluster/os-ha-contrail/openstack/compute.yml
+++ b/classes/cluster/os-ha-contrail/openstack/compute.yml
@@ -9,6 +9,8 @@
 - system.opencontrail.client.cluster
 - system.opencontrail.client.resource.virtual_router
 - service.opencontrail.compute.cluster
+- service.opencontrail.compute.lbaas.barbican
+- service.barbican.client.cluster
 - cluster.os-ha-contrail
 parameters:
   _param:
diff --git a/classes/cluster/os-ha-contrail/openstack/control.yml b/classes/cluster/os-ha-contrail/openstack/control.yml
index 2b6c6f8..e5ab6a3 100755
--- a/classes/cluster/os-ha-contrail/openstack/control.yml
+++ b/classes/cluster/os-ha-contrail/openstack/control.yml
@@ -24,6 +24,7 @@
 - system.designate.server.cluster
 - system.designate.server.backend.bind
 - system.galera.server.cluster
+- system.galera.server.database.barbican
 - system.galera.server.database.cinder
 - system.galera.server.database.glance
 - system.galera.server.database.heat
@@ -31,6 +32,8 @@
 - system.galera.server.database.nova
 - system.galera.server.database.designate
 - system.haproxy.proxy.listen.openstack.nova-placement
+- system.barbican.server.cluster
+- service.barbican.server.plugin.simple_crypto
 - cluster.os-ha-contrail
 parameters:
   _param:
@@ -62,6 +65,13 @@
       instance:
         VIP:
           virtual_router_id: 150
+  barbican:
+    server:
+      store:
+        software:
+          crypto_plugin: simple_crypto
+          store_plugin: store_crypto
+          global_default: True
   bind:
     server:
       control:
diff --git a/classes/cluster/os-ha-contrail/openstack/init.yml b/classes/cluster/os-ha-contrail/openstack/init.yml
index 826c807..a6c09ff 100755
--- a/classes/cluster/os-ha-contrail/openstack/init.yml
+++ b/classes/cluster/os-ha-contrail/openstack/init.yml
@@ -75,6 +75,7 @@
       rndc_host: ${_param:openstack_control_node01_address}
       rndc_port: 953
       rndc_key_file: /etc/designate/rndc.key
+    barbican_version: ${_param:openstack_version}
     designate_version: ${_param:openstack_version}
     cluster_vip_address: ${_param:openstack_control_address}
     glance_version: ${_param:openstack_version}
@@ -93,10 +94,12 @@
     neutron_service_host: ${_param:openstack_control_address}
     glusterfs_service_host: ${_param:openstack_control_address}
     designate_service_host: ${_param:openstack_control_address}
+    barbican_service_host: ${_param:openstack_control_address}
     mysql_admin_user: root
     mysql_admin_password: workshop
-    mysql_designate_password: workshop
+    mysql_barbican_password: workshop
     mysql_cinder_password: workshop
+    mysql_designate_password: workshop
     mysql_glance_password: workshop
     mysql_heat_password: workshop
     mysql_keystone_password: workshop
@@ -104,6 +107,7 @@
     mysql_nova_password: workshop
     keystone_service_token: workshop
     keystone_admin_password: workshop
+    keystone_barbican_password: workshop
     keystone_cinder_password: workshop
     keystone_glance_password: workshop
     keystone_heat_password: workshop
@@ -117,6 +121,10 @@
     horizon_identity_host: ${_param:openstack_control_address}
     horizon_identity_encryption: none
     horizon_identity_version: 2
+    opencontrail_barbican_user: admin
+    opencontrail_barbican_password: ${_param:keystone_admin_password}
+    opencontrail_barbican_tenant: admin
+    barbican_simple_crypto_kek: "YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoxMjM0NTY="
   linux:
     network:
       host:
diff --git a/classes/cluster/os-ha-contrail/openstack/proxy.yml b/classes/cluster/os-ha-contrail/openstack/proxy.yml
index 23c0c2b..37a9234 100755
--- a/classes/cluster/os-ha-contrail/openstack/proxy.yml
+++ b/classes/cluster/os-ha-contrail/openstack/proxy.yml
@@ -4,6 +4,7 @@
 - system.nginx.server.proxy.openstack_api
 - system.nginx.server.proxy.openstack_vnc
 - system.nginx.server.proxy.openstack_web
+- system.nginx.server.proxy.openstack.barbican
 - system.salt.minion.cert.proxy
 - cluster.os-ha-contrail
 parameters:
diff --git a/classes/cluster/os-ha-ovs-syndic/init.yml b/classes/cluster/os-ha-ovs-syndic/init.yml
index b4d28ad..5e4d440 100644
--- a/classes/cluster/os-ha-ovs-syndic/init.yml
+++ b/classes/cluster/os-ha-ovs-syndic/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - system.linux.system.single
 - cluster.os-ha-ovs-syndic.infra
 - cluster.os-ha-ovs-syndic.openstack
diff --git a/classes/cluster/os-ha-ovs/init.yml b/classes/cluster/os-ha-ovs/init.yml
index 37bd6d8..7c35891 100644
--- a/classes/cluster/os-ha-ovs/init.yml
+++ b/classes/cluster/os-ha-ovs/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - system.linux.system.single
 - cluster.os-ha-ovs.infra
 - cluster.os-ha-ovs.openstack
diff --git a/classes/cluster/sl-k8s-calico/init.yml b/classes/cluster/sl-k8s-calico/init.yml
index eca25ff..e21b7ee 100644
--- a/classes/cluster/sl-k8s-calico/init.yml
+++ b/classes/cluster/sl-k8s-calico/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - cluster.sl-k8s-calico.kubernetes
 - cluster.sl-k8s-calico.stacklight
 - cluster.sl-k8s-calico.infra
diff --git a/classes/cluster/sl-k8s-contrail/init.yml b/classes/cluster/sl-k8s-contrail/init.yml
index 5ea4d4f..2e194af 100644
--- a/classes/cluster/sl-k8s-contrail/init.yml
+++ b/classes/cluster/sl-k8s-contrail/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - system.linux.system.single
 - cluster.sl-k8s-contrail.kubernetes
 - cluster.sl-k8s-contrail.opencontrail
diff --git a/classes/cluster/sl-os-contrail/init.yml b/classes/cluster/sl-os-contrail/init.yml
index 036e716..e410120 100755
--- a/classes/cluster/sl-os-contrail/init.yml
+++ b/classes/cluster/sl-os-contrail/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - system.linux.system.repo.mcp.extra
 - system.linux.system.single
 - system.rsyslog.client.single
diff --git a/classes/cluster/sl-os-ovs/init.yml b/classes/cluster/sl-os-ovs/init.yml
index f9be30f..bbd135b 100644
--- a/classes/cluster/sl-os-ovs/init.yml
+++ b/classes/cluster/sl-os-ovs/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - system.linux.system.single
 - system.openssh.server.team.lab
 - system.openssh.server.team.tcpcloud
diff --git a/classes/cluster/virtual-mcp-ocata-dvr/init.yml b/classes/cluster/virtual-mcp-ocata-dvr/init.yml
index bd4c2e4..14f6686 100644
--- a/classes/cluster/virtual-mcp-ocata-dvr/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-dvr/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - service.grafana.collector
 - system.heka.log_collector.single
 - system.heka.log_collector.output.telegraf
diff --git a/classes/cluster/virtual-mcp-ocata-ovs/init.yml b/classes/cluster/virtual-mcp-ocata-ovs/init.yml
index a178f05..d2e3d71 100644
--- a/classes/cluster/virtual-mcp-ocata-ovs/init.yml
+++ b/classes/cluster/virtual-mcp-ocata-ovs/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - service.grafana.collector
 - system.heka.log_collector.single
 - system.heka.log_collector.output.telegraf
diff --git a/classes/cluster/virtual-mcp05-dvr/init.yml b/classes/cluster/virtual-mcp05-dvr/init.yml
index 3e2f8cf..1af77a3 100644
--- a/classes/cluster/virtual-mcp05-dvr/init.yml
+++ b/classes/cluster/virtual-mcp05-dvr/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - system.linux.system.single
 - system.rsyslog.client.single
 - system.openssh.server.team.lab
diff --git a/classes/cluster/virtual-mcp05-ovs/init.yml b/classes/cluster/virtual-mcp05-ovs/init.yml
index 6c67937..ead6ba8 100644
--- a/classes/cluster/virtual-mcp05-ovs/init.yml
+++ b/classes/cluster/virtual-mcp05-ovs/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - system.linux.system.single
 - cluster.virtual-mcp05-ovs.infra
 - cluster.virtual-mcp05-ovs.openstack
diff --git a/classes/cluster/virtual-mcp10-contrail/init.yml b/classes/cluster/virtual-mcp10-contrail/init.yml
index da3e7b1..5c405d4 100755
--- a/classes/cluster/virtual-mcp10-contrail/init.yml
+++ b/classes/cluster/virtual-mcp10-contrail/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - system.linux.system.single
 - system.rsyslog.client.single
 - system.openssh.server.team.lab
diff --git a/classes/cluster/virtual-mcp10-dvr/init.yml b/classes/cluster/virtual-mcp10-dvr/init.yml
index ce47464..e1a87ce 100644
--- a/classes/cluster/virtual-mcp10-dvr/init.yml
+++ b/classes/cluster/virtual-mcp10-dvr/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - system.linux.system.single
 - system.rsyslog.client.single
 - system.openssh.server.team.lab
diff --git a/classes/cluster/virtual-mcp10-ovs/init.yml b/classes/cluster/virtual-mcp10-ovs/init.yml
index 01ccbbf..af37ef4 100644
--- a/classes/cluster/virtual-mcp10-ovs/init.yml
+++ b/classes/cluster/virtual-mcp10-ovs/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - system.linux.system.single
 - cluster.virtual-mcp10-ovs.infra
 - cluster.virtual-mcp10-ovs.openstack
diff --git a/classes/cluster/virtual-mcp11-aio/init.yml b/classes/cluster/virtual-mcp11-aio/init.yml
index d75ffcd..b3fcc39 100755
--- a/classes/cluster/virtual-mcp11-aio/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - service.git.client
 - system.linux.system.single
 - system.linux.system.repo.mcp.salt
diff --git a/classes/cluster/virtual-mcp11-contrail-nfv/init.yml b/classes/cluster/virtual-mcp11-contrail-nfv/init.yml
index 78298cb..9b0ff88 100755
--- a/classes/cluster/virtual-mcp11-contrail-nfv/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail-nfv/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - system.linux.system.single
 - system.rsyslog.client.single
 - system.openssh.server.team.lab
diff --git a/classes/cluster/virtual-mcp11-contrail/init.yml b/classes/cluster/virtual-mcp11-contrail/init.yml
index 613edb9..b5796bd 100755
--- a/classes/cluster/virtual-mcp11-contrail/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - service.grafana.collector
 - system.heka.log_collector.single
 - system.heka.log_collector.output.telegraf
diff --git a/classes/cluster/virtual-mcp11-dvr/init.yml b/classes/cluster/virtual-mcp11-dvr/init.yml
index 80a2628..8e93cbf 100644
--- a/classes/cluster/virtual-mcp11-dvr/init.yml
+++ b/classes/cluster/virtual-mcp11-dvr/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - service.grafana.collector
 - system.heka.log_collector.single
 - system.heka.log_collector.output.telegraf
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-dyn/init.yml b/classes/cluster/virtual-mcp11-k8s-calico-dyn/init.yml
index 5484c66..10957f2 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-dyn/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-dyn/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - cluster.virtual-mcp11-k8s-calico-dyn.kubernetes
 - cluster.virtual-mcp11-k8s-calico-dyn.stacklight
 - cluster.virtual-mcp11-k8s-calico-dyn.infra
diff --git a/classes/cluster/virtual-mcp11-k8s-calico-minimal/init.yml b/classes/cluster/virtual-mcp11-k8s-calico-minimal/init.yml
index e1ad5a6..56a3029 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico-minimal/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico-minimal/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - cluster.virtual-mcp11-k8s-calico-minimal.kubernetes
 - cluster.virtual-mcp11-k8s-calico-minimal.infra
 - cluster.overrides
diff --git a/classes/cluster/virtual-mcp11-ovs-dpdk/init.yml b/classes/cluster/virtual-mcp11-ovs-dpdk/init.yml
index e97b1a5..ef16a9e 100644
--- a/classes/cluster/virtual-mcp11-ovs-dpdk/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs-dpdk/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - system.linux.system.single
 - cluster.virtual-mcp11-ovs-dpdk.infra
 - cluster.virtual-mcp11-ovs-dpdk.openstack
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/init.yml b/classes/cluster/virtual-mcp11-ovs-ironic/init.yml
index 654b013..a9ccc70 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - system.linux.system.single
 - cluster.virtual-mcp11-ovs-ironic.infra
 - cluster.virtual-mcp11-ovs-ironic.openstack
diff --git a/classes/cluster/virtual-mcp11-ovs/init.yml b/classes/cluster/virtual-mcp11-ovs/init.yml
index 2f85ae8..6d4d246 100644
--- a/classes/cluster/virtual-mcp11-ovs/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs/init.yml
@@ -1,4 +1,5 @@
 classes:
+- system.linux.network.dynamic_hosts
 - system.linux.system.single
 - cluster.virtual-mcp11-ovs.infra
 - cluster.virtual-mcp11-ovs.openstack