Merge branch 'pull/2869/head'

* pull/2869/head: (PUP-3010) Allow Upstart jobs on Amazon Linux
puppetlabs · Sep 30, 2014 · 6607c11 · 6607c11
2 parents 199f8cb + 0fe4898
commit 6607c11
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/lib/puppet/provider/service/upstart.rb b/lib/puppet/provider/service/upstart.rb
@@ -14,6 +14,7 @@
   confine :any => [
     Facter.value(:operatingsystem) == 'Ubuntu',
     (Facter.value(:osfamily) == 'RedHat' and Facter.value(:operatingsystemrelease) =~ /^6\./),
+    Facter.value(:operatingsystem) == 'Amazon'
   ]
 
   defaultfor :operatingsystem => :ubuntu