Merge pull request voxpupuli#12 from tbartelmess/master

stankevich · stankevich · commit fa0a4fb27d68 · 2013-05-12T19:28:52.000-07:00
Support for CentOS and RedHat Linux
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -37,7 +37,7 @@
 ) {
 
   # Module compatibility check
-  $compatible = [ 'Debian', 'Ubuntu' ]
+  $compatible = [ 'Debian', 'Ubuntu', 'CentOS', 'RedHat' ]
   if ! ($::operatingsystem in $compatible) {
     fail("Module is not compatible with ${::operatingsystem}")
   }
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -5,14 +5,19 @@
     default  => "python${python::version}",
   }
 
+  $pythondev = $::operatingsystem ? {
+    'RedHat', 'CentOS', 'Fedora' => "$python-devel",
+    'Debian', 'Ubuntu' => "$python-dev"
+  }
+
   package { $python: ensure => present }
 
   $dev_ensure = $python::dev ? {
     true    => present,
     default => absent,
   }
 
-  package { [ "${python}-dev", 'python-pip' ]: ensure => $dev_ensure }
+  package { [ $pythondev, 'python-pip' ]: ensure => $dev_ensure }
 
   $venv_ensure = $python::virtualenv ? {
     true    => present,

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`) {`
`38`	`38`
`39`	`39`	`# Module compatibility check`
`40`		`- $compatible = [ 'Debian', 'Ubuntu' ]`
	`40`	`+ $compatible = [ 'Debian', 'Ubuntu', 'CentOS', 'RedHat' ]`
`41`	`41`	`if ! ($::operatingsystem in $compatible) {`
`42`	`42`	`fail("Module is not compatible with ${::operatingsystem}")`
`43`	`43`	`}`