Comment 1 for bug 1511693

Class['keystone::roles::admin'] -> Class['openstack::auth_file']
https://github.com/openstack/fuel-library/blob/cf54da03b19c9b3b87cc51cfde519b1ee5428de7/deployment/puppet/osnailyfacter/modular/keystone/keystone.pp#L212-L213

I'm not sure if I get your point, but doesn't that does what you described? Except we still have purge_openrc there.