Fix fb_init_sample (facebook#309)

Summary:
Commit 68f51c1 accidentally removed a bunch of stuff from Ubuntu and
Debian. This fixes the logic to put it back.

That fixes current test failures.

Signed-off-by: Phil Dibowitz <phil@ipom.com>

Pull Request resolved: facebook#309

Differential Revision: D73619852

fbshipit-source-id: 3b8bdc9ed4465aa8c9c28ad5cba1512d09d6211c

Author: jaymzh

cookbooks/fb_init_sample/recipes/default.rb

@@ -134,18 +134,20 @@
   include_recipe 'fb_init_sample::firstboot'
 end
 
-if node.centos?
-  # https://bugzilla.redhat.com/show_bug.cgi?id=2337139
-  if node.centos_max_version?(9)
-    include_recipe 'fb_apcupsd'
-  end
-  # Turn off dnsmasq as it doesn't play well with travis
-  node.default['fb_dnsmasq']['enable'] = false
-  include_recipe 'fb_dnsmasq'
-  # https://bugzilla.redhat.com/show_bug.cgi?id=2345748
-  if node.centos_max_version?(9)
-    include_recipe 'fb_collectd'
-  end
+# APCUPSD is not yet in C10+
+# https://bugzilla.redhat.com/show_bug.cgi?id=2337139
+if !node.rhel_family? || node.el_max_version?(9)
+  include_recipe 'fb_apcupsd'
+end
+
+# Turn off dnsmasq as it doesn't play well with travis
+node.default['fb_dnsmasq']['enable'] = false
+include_recipe 'fb_dnsmasq'
+
+# Collected is not yet in C10+
+# https://bugzilla.redhat.com/show_bug.cgi?id=2345748
+if !node.rhel_family? || node.el_max_version?(9)
+  include_recipe 'fb_collectd'
 end
 include_recipe 'fb_rsync::server'
 if node.centos?