Use roles from the cluster flavor

Change-Id: I7f2a2fcefceb2d7daa3a7343f21d9ac41d7caec9