summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-08-25 01:12:18 +0000
committerGerrit Code Review <review@openstack.org>2017-08-25 01:12:18 +0000
commit3c54ae46b1b2d69a892d4a1ee1ec57851e9d08ea (patch)
tree668810fa9fa7cbd0ae5c4ed7454921aa363623e0
parent1c6e7f380e5d81f31863279e96ceeb850c8a9e9e (diff)
parentbd054ab0c093b03adf4a8cc8bb26e5abfca9c859 (diff)
Merge "Ensure curl is installed"
-rw-r--r--manifests/init.pp11
1 files changed, 9 insertions, 2 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index be190d8..786eb5c 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -12,20 +12,27 @@ class pip (
12 package { $::pip::params::python_devel_package: 12 package { $::pip::params::python_devel_package:
13 ensure => present, 13 ensure => present,
14 } 14 }
15 if !defined(Package['curl']) {
16 package { 'curl':
17 ensure => present,
18 }
19 }
15 20
16 if $::operatingsystem != 'CentOS' { 21 if $::operatingsystem != 'CentOS' {
17 exec { 'download-pip3': 22 exec { 'download-pip3':
18 command => "/usr/bin/curl ${::pip::params::get_pip_location} | /usr/bin/python3 - -U --force-reinstall", 23 command => "/usr/bin/curl ${::pip::params::get_pip_location} | /usr/bin/python3 - -U --force-reinstall",
19 creates => $::pip::params::get_pip3_path, 24 creates => $::pip::params::get_pip3_path,
20 before => Exec['download-pip'], 25 before => Exec['download-pip'],
21 notify => Exec[$::pip::params::get_pip_path] 26 notify => Exec[$::pip::params::get_pip_path],
27 require => Package['curl'],
22 } 28 }
23 } 29 }
24 30
25 exec { 'download-pip': 31 exec { 'download-pip':
26 command => "/usr/bin/curl ${::pip::params::get_pip_location} | /usr/bin/python - -U --force-reinstall", 32 command => "/usr/bin/curl ${::pip::params::get_pip_location} | /usr/bin/python - -U --force-reinstall",
27 creates => $::pip::params::get_pip2_path, 33 creates => $::pip::params::get_pip2_path,
28 notify => Exec[$::pip::params::get_pip_path] 34 notify => Exec[$::pip::params::get_pip_path],
35 require => Package['curl'],
29 } 36 }
30 37
31 # NOTE(pabelanger): Default to pip2 for backwards compat 38 # NOTE(pabelanger): Default to pip2 for backwards compat