Added the wait to the devstack box also.

Change-Id: If60405e874cebde512fee118d63a6eec488adf5c