We should probably upgrade to Facter 1.7 now that it's out. Then you would be able to use a confine with a regexp: http://projects.puppetlabs.com/issues/17917