fixed python dev install when using scl

voxpupuli · Dec 5, 2015 · 8de9098 · 8de9098
1 parent 0ba2ac9
commit 8de9098
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -50,11 +50,6 @@
  name => $python,
  }
 
- package { 'python-dev':
- ensure => $dev_ensure,
- name => $pythondev,
- }
-
  package { 'pip':
  ensure => $pip_ensure,
  require => Package['python'],
@@ -67,6 +62,12 @@
 
  case $python::provider {
  pip: {
+
+ package { 'python-dev':
+ ensure => $dev_ensure,
+ name => $pythondev,
+ }
+
  # Install pip without pip, see https://pip.pypa.io/en/stable/installing/.
  exec { 'bootstrap pip':
  command => '/usr/bin/curl https://bootstrap.pypa.io/get-pip.py | python',
@@ -116,7 +117,7 @@
  # ensure => $venv_ensure,
  # require => Package['scl-utils'],
  # }
- package { "${python::version}-scldev":
+ package { "${python}-scldevel":
  ensure => $dev_ensure,
  require => Package['scl-utils'],
  }
@@ -142,7 +143,7 @@
  tag => 'python-scl-package',
  }
 
- package { "${python::version}-scldev":
+ package { "${python}-scldevel":
  ensure => $dev_ensure,
  tag => 'python-scl-package',
  }
@@ -161,6 +162,12 @@
  }
 
  default: {
+
+ package { 'python-dev':
+ ensure => $dev_ensure,
+ name => $pythondev,
+ }
+
  if $::osfamily == 'RedHat' {
  if $pip_ensure != 'absent' {
  if $python::use_epel == true {