Merge pull request voxpupuli#48 from davideme/master

stankevich · stankevich · commit 2bab9c9a03cd · 2014-01-03T03:32:33.000-08:00
Add support for Amazon distro by using osfamily instead operatingsytem fact
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -44,8 +44,8 @@
 ) {
 
   # Module compatibility check
-  $compatible = [ 'Debian', 'Ubuntu', 'CentOS', 'RedHat', 'Scientific' ]
-  if ! ($::operatingsystem in $compatible) {
+  $compatible = [ 'Debian', 'RedHat']
+  if ! ($::osfamily in $compatible) {
     fail("Module is not compatible with ${::operatingsystem}")
   }
 
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -20,9 +20,9 @@
     default  => "python${python::version}",
   }
 
-  $pythondev = $::operatingsystem ? {
-    /(?i:RedHat|CentOS|Fedora|Scientific)/ => "${python}-devel",
-    /(?i:Debian|Ubuntu)/ => "${python}-dev"
+  $pythondev = $::osfamily ? {
+    RedHat => "${python}-devel",
+    Debian => "${python}-dev"
   }
 
   $dev_ensure = $python::dev ? {

Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,8 @@`
`44`	`44`	`) {`
`45`	`45`
`46`	`46`	`# Module compatibility check`
`47`		`- $compatible = [ 'Debian', 'Ubuntu', 'CentOS', 'RedHat', 'Scientific' ]`
`48`		`- if ! ($::operatingsystem in $compatible) {`
	`47`	`+ $compatible = [ 'Debian', 'RedHat']`
	`48`	`+ if ! ($::osfamily in $compatible) {`
`49`	`49`	`fail("Module is not compatible with ${::operatingsystem}")`
`50`	`50`	`}`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,9 @@`
`20`	`20`	`default => "python${python::version}",`
`21`	`21`	`}`
`22`	`22`
`23`		`- $pythondev = $::operatingsystem ? {`
`24`		`- /(?i:RedHat\|CentOS\|Fedora\|Scientific)/ => "${python}-devel",`
`25`		`- /(?i:Debian\|Ubuntu)/ => "${python}-dev"`
	`23`	`+ $pythondev = $::osfamily ? {`
	`24`	`+ RedHat => "${python}-devel",`
	`25`	`+ Debian => "${python}-dev"`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`$dev_ensure = $python::dev ? {`