`role_name` is a reserved variable name. Instead, use the explicit service_role_name variables when adding roles to users. Change-Id: Ia5fa0e400aeec6d808891c5dd793ee8177d9b5f3