diff --git a/classes/cluster/os-ha-contrail-40/openstack/control.yml b/classes/cluster/os-ha-contrail-40/openstack/control.yml
index 0234048..3e0ea70 100644
--- a/classes/cluster/os-ha-contrail-40/openstack/control.yml
+++ b/classes/cluster/os-ha-contrail-40/openstack/control.yml
@@ -27,6 +27,7 @@
 - system.galera.server.database.heat
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
+- system.galera.server.database.neutron
 - system.galera.server.database.designate
 - system.haproxy.proxy.listen.openstack.nova-placement
 - cluster.os-ha-contrail-40.openstack.dashboard
diff --git a/classes/cluster/os-ha-contrail/openstack/control.yml b/classes/cluster/os-ha-contrail/openstack/control.yml
index 5d853ed..04bf919 100755
--- a/classes/cluster/os-ha-contrail/openstack/control.yml
+++ b/classes/cluster/os-ha-contrail/openstack/control.yml
@@ -28,6 +28,7 @@
 - system.galera.server.database.heat
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
+- system.galera.server.database.neutron
 - system.galera.server.database.designate
 - system.haproxy.proxy.listen.openstack.nova-placement
 - system.barbican.server.cluster
diff --git a/classes/cluster/sl-os-contrail/openstack/control.yml b/classes/cluster/sl-os-contrail/openstack/control.yml
index bfeb04a..e6aab62 100755
--- a/classes/cluster/sl-os-contrail/openstack/control.yml
+++ b/classes/cluster/sl-os-contrail/openstack/control.yml
@@ -37,6 +37,7 @@
 - system.galera.server.database.heat
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
+- system.galera.server.database.neutron
 - system.galera.server.database.designate
 - system.keepalived.cluster.instance.default_keepalived_check
 - cluster.sl-os-contrail
diff --git a/classes/cluster/sl-os-ovs/openstack/control.yml b/classes/cluster/sl-os-ovs/openstack/control.yml
index 507b315..2125d80 100644
--- a/classes/cluster/sl-os-ovs/openstack/control.yml
+++ b/classes/cluster/sl-os-ovs/openstack/control.yml
@@ -25,6 +25,7 @@
 - system.galera.server.database.heat
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
+- system.galera.server.database.neutron
 - system.haproxy.proxy.listen.openstack.nova-placement
 - system.keepalived.cluster.instance.default_keepalived_check
 - cluster.sl-os-ovs
diff --git a/classes/cluster/sl-pike-dvr/openstack/control.yml b/classes/cluster/sl-pike-dvr/openstack/control.yml
index f0ac140..8a72cf2 100644
--- a/classes/cluster/sl-pike-dvr/openstack/control.yml
+++ b/classes/cluster/sl-pike-dvr/openstack/control.yml
@@ -31,6 +31,7 @@
 - system.galera.server.database.heat
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
+- system.galera.server.database.neutron
 - system.prometheus.relay
 - system.prometheus.server.standalone
 - system.prometheus.server.target.federation
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/control.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/control.yml
index afb9c68..1a556e1 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/control.yml
@@ -38,6 +38,7 @@
 - system.galera.server.database.heat
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
+- system.galera.server.database.neutron
 - system.galera.server.database.designate
 - cluster.virtual-mcp-mitaka-dvr-trusty
 
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/control.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/control.yml
index d2ee102..1b3a919 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/control.yml
@@ -34,6 +34,7 @@
 - system.galera.server.database.heat
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
+- system.galera.server.database.neutron
 - system.galera.server.database.designate
 - cluster.virtual-mcp-mitaka-ovs-trusty
 
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
index 958e72d..09a3319 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
@@ -40,6 +40,7 @@
 - system.galera.server.database.heat
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
+- system.galera.server.database.neutron
 - system.galera.server.database.designate
 - system.galera.server.database.manila
 - system.galera.server.database.aodh
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
index 4d44545..9f2c63c 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
@@ -39,6 +39,7 @@
 - system.galera.server.database.heat
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
+- system.galera.server.database.neutron
 - system.galera.server.database.designate
 - system.galera.server.database.manila
 - system.galera.server.database.aodh
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml
index 3099dc2..accf8ea 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml
@@ -28,6 +28,7 @@
 - system.galera.server.database.heat
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
+- system.galera.server.database.neutron
 - system.galera.server.database.designate
 - system.galera.server.database.manila
 - system.galera.server.database.aodh
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
index 217fa17..276c6e4 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
@@ -30,6 +30,7 @@
 - system.galera.server.database.heat
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
+- system.galera.server.database.neutron
 - system.galera.server.database.designate
 - system.galera.server.database.manila
 - system.galera.server.database.aodh
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
index e8b5cd4..a17ba89 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
@@ -35,6 +35,7 @@
 - system.galera.server.database.heat
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
+- system.galera.server.database.neutron
 - system.galera.server.database.designate
 - system.galera.server.database.aodh
 - system.galera.server.database.panko
diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/control.yml b/classes/cluster/virtual-offline-pike-ovs/openstack/control.yml
index 5fdb7da..7933f6e 100644
--- a/classes/cluster/virtual-offline-pike-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/openstack/control.yml
@@ -35,6 +35,7 @@
 - system.galera.server.database.heat
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
+- system.galera.server.database.neutron
 - system.galera.server.database.designate
 - system.haproxy.proxy.listen.openstack.nova-placement
 - cluster.virtual-offline-pike-ovs
diff --git a/classes/cluster/virtual-offline-ssl/openstack/control.yml b/classes/cluster/virtual-offline-ssl/openstack/control.yml
index 3646709..b196b83 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/control.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/control.yml
@@ -35,6 +35,7 @@
 - system.galera.server.database.heat
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
+- system.galera.server.database.neutron
 - system.galera.server.database.designate
 - system.galera.server.database.manila
 - system.galera.server.database.aodh