Align the cinder-storage.yaml template with block-storage.yaml

Change-Id: I00af10e07feed6c9c97ee6cad545dbff88cd6afc