Re-write the roles

Signed-off-by: Zhongqinag Dou <zdou@redhat.com>