Clean up cinder race fix
Clean up cinder race fix

This patch cleans up the code dealing with the race condition in the
cinder volumes script.

Closes-Bug: #1525659
Change-Id: I85d1adebfa22fa384b1711a91dd30dd339bd8aab

openstack/training-labs,openstack/training-labs,openstack/training-labs