diff --git a/manifests/network.pp b/manifests/network.pp
index 062ee1b2..f03ada52 100644
--- a/manifests/network.pp
+++ b/manifests/network.pp
@@ -69,4 +69,17 @@ class privatecloud::network(
     local_ip         => $tunnel_eth
   }
 
+  class { 'neutron::plugins::ml2':
+    type_drivers            => ['gre'],
+    tenant_network_types    => ['gre'],
+    mechanism_drivers       => ['openvswitch'],
+    tunnel_id_ranges        => ['1:10000'],
+    # For later (when https://review.openstack.org/#/c/63228/ got merged)
+    # enable_security_group => true
+  }
+  # While https://review.openstack.org/#/c/63228/ is not merged:
+  neutron_plugin_ml2 {
+    'securitygroup/firewall_driver': value => true;
+  }
+
 }
diff --git a/manifests/network/controller.pp b/manifests/network/controller.pp
index 72efd6f6..cc90b8a1 100644
--- a/manifests/network/controller.pp
+++ b/manifests/network/controller.pp
@@ -47,17 +47,4 @@ class privatecloud::network::controller(
     options           => 'check inter 2000 rise 2 fall 5'
   }
 
-  class { 'neutron::plugins::ml2':
-    type_drivers            => ['gre'],
-    tenant_network_types    => ['gre'],
-    mechanism_drivers       => ['openvswitch'],
-    tunnel_id_ranges        => ['1:10000'],
-    # For later (when https://review.openstack.org/#/c/63228/ got merged)
-    # enable_security_group => true
-  }
-  # While https://review.openstack.org/#/c/63228/ is not merged:
-  neutron_plugin_ml2 {
-    'securitygroup/firewall_driver': value => true;
-  }
-
 }