Fix failing tests

This commit fixes tests that were failing as a result of:

  https://review.openstack.org/#/c/34046/

This updates the cinder defaults to fix the tests.

Change-Id: I9def5d2eb2b8229fedabe92f6bdceefbf4d8fcf3