Revert "Ensure latest setuptools after installing pip."
This reverts commit d1b79539c4
.
This commit was breaking devstack-gate for stable/grizzly changes.
Change-Id: I6b138d7ed5f8ad0362801b569dd46834d41b4cf7
This commit is contained in:
parent
82fcf8e8d4
commit
82936cd43e
@ -12,12 +12,6 @@ class pip {
|
|||||||
require => Package[$::pip::params::python_devel_package]
|
require => Package[$::pip::params::python_devel_package]
|
||||||
}
|
}
|
||||||
|
|
||||||
package { 'setuptools':
|
|
||||||
ensure => latest,
|
|
||||||
provider => pip,
|
|
||||||
require => Package[$::pip::params::python_pip_package],
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($::operatingsystem in ['CentOS', 'RedHat']) {
|
if ($::operatingsystem in ['CentOS', 'RedHat']) {
|
||||||
|
|
||||||
file { '/usr/bin/pip':
|
file { '/usr/bin/pip':
|
||||||
|
@ -12,10 +12,4 @@ class pip::python3 {
|
|||||||
require => Package[$::pip::params::python3_devel_package]
|
require => Package[$::pip::params::python3_devel_package]
|
||||||
}
|
}
|
||||||
|
|
||||||
package { 'setuptools':
|
|
||||||
ensure => latest,
|
|
||||||
provider => pip3,
|
|
||||||
require => Package[$::pip::params::python3_pip_package],
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user