Fix missing Cinder config after refactor

Somehow Cinder was only half finished in the recent refactor. Kill the
cinder-volume role and merge it into cinder-data.