As discovered in NDS-783, now that a single node can have multiple roles, the flavor-per-role design is no longer effective.

Per Mike's recommendation:

• remove all flavors from group_vars / site_vars and put them in the inventory instead