Merge "Add role to aodh and panko"