opendev/puppet-pip
Code Issues Proposed changes

Ensure curl is installed

Browse Source 
Depends-On: I8b346cbfb908c5d2094c5e46ff008ef735b0e903
Depends-On: Icd0c652ff2f522ce2ea9086965f53e1a03f0d4fd
Depends-On: I17c119e81a035916550de44356b9f4badd505c81
Change-Id: Ia8e6bf0a0dd686933cd04a5e678d1f88ebdd8245
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-08-24 12:39:48 -04:00 committed by Clark Boylan
parent 44090680a9
commit bd054ab0c0
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/init.pp
View File

@ -12,20 +12,27 @@ class pip (
package { $::pip::params::python_devel_package: package { $::pip::params::python_devel_package:
ensure => present, ensure => present,
} }
if !defined(Package['curl']) {
package { 'curl':
ensure => present,
}
}
if $::operatingsystem != 'CentOS' { if $::operatingsystem != 'CentOS' {
exec { 'download-pip3': exec { 'download-pip3':
command => "/usr/bin/curl ${::pip::params::get_pip_location} | /usr/bin/python3 - -U --force-reinstall", command => "/usr/bin/curl ${::pip::params::get_pip_location} | /usr/bin/python3 - -U --force-reinstall",
creates => $::pip::params::get_pip3_path, creates => $::pip::params::get_pip3_path,
before => Exec['download-pip'], before => Exec['download-pip'],
notify => Exec[$::pip::params::get_pip_path] notify => Exec[$::pip::params::get_pip_path],
require => Package['curl'],
} }
} }
exec { 'download-pip': exec { 'download-pip':
command => "/usr/bin/curl ${::pip::params::get_pip_location} | /usr/bin/python - -U --force-reinstall", command => "/usr/bin/curl ${::pip::params::get_pip_location} | /usr/bin/python - -U --force-reinstall",
creates => $::pip::params::get_pip2_path, creates => $::pip::params::get_pip2_path,
notify => Exec[$::pip::params::get_pip_path] notify => Exec[$::pip::params::get_pip_path],
require => Package['curl'],
} }
# NOTE(pabelanger): Default to pip2 for backwards compat # NOTE(pabelanger): Default to pip2 for backwards compat