Added a choice between using role and ignore-tenant-role
Tweaked the code to use the new options