radosgw federated keyrings conflict

Compare:
https://github.com/ceph/ceph-chef/blob/master/recipes/radosgw_federated.rb#L39
https://github.com/ceph/ceph-chef/blob/master/templates/default/ceph.conf.erb#L229

The logic used to decide if the keyring should be at
"/etc/ceph/#{node['ceph']['cluster']}.client.radosgw.#{inst['region']}-#{inst['name']}.keyring"
OR
"/etc/ceph/#{node['ceph']['cluster']}.client.radosgw.keyring"

Is reversed on one of them. I'm not certain which one is wrong, either way could be correct with the keyring cleanup, esp as there aren't many cases I can think of that would need multiple RGW instances on a single host in different region/zones.