Revert "Change role to cinder"

This reverts commit 698045bef009340b9b77bd4c5a2c1fe6387b784b.

Change-Id: I47ee51070b9cc7ec26e92e92e145c4e08a86848c