Update cinder options for icehouse

Change-Id: If23fc120c239b2b4fbc4c7fc715b0ba3f9d817ea