diff --git a/chef/cookbooks/openstack-block-storage/recipes/volume.rb b/chef/cookbooks/openstack-block-storage/recipes/volume.rb
index 487a5d2..1191649 100644
--- a/chef/cookbooks/openstack-block-storage/recipes/volume.rb
+++ b/chef/cookbooks/openstack-block-storage/recipes/volume.rb
@@ -61,7 +61,7 @@ directory "/var/lock/cinder" do
   mode 00700
 end
 
-execute "cinder-manage db sync"
+execute "timeout 300s sh -c 'while ! cinder-manage db sync; do sleep 30; done'"
 
 case node["openstack"]["block-storage"]["volume"]["driver"]
   when "cinder.volume.drivers.netapp.iscsi.NetAppISCSIDriver"