diff --git a/extraconfig/tasks/pacemaker_resource_restart.sh b/extraconfig/tasks/pacemaker_resource_restart.sh
index ad3c3701d5..4e8b20fde8 100755
--- a/extraconfig/tasks/pacemaker_resource_restart.sh
+++ b/extraconfig/tasks/pacemaker_resource_restart.sh
@@ -41,6 +41,12 @@ if [ "$pacemaker_status" = "active" -a \
      "$(hiera bootstrap_nodeid)" = "$(facter hostname)" -a \
      "$(hiera update_identifier)" != "nil" ]; then
 
+    #ensure neutron constraints like
+    #https://review.openstack.org/#/c/245093/
+    if  pcs constraint order show  | grep "start neutron-server-clone then start neutron-ovs-cleanup-clone"; then
+        pcs constraint remove order-neutron-server-clone-neutron-ovs-cleanup-clone-mandatory
+    fi
+
     pcs resource disable httpd
     check_resource httpd stopped 300
     pcs resource disable openstack-keystone