Install pip using get-pip in launch node
packaged pip vs. upstream pip gets the systems very broken. Make launch-node use get-pip to install pip as per: http://www.pip-installer.org/en/latest/installing.html Change-Id: Ice28b47d766c04b42462a7297911dc1a1abe5a77
This commit is contained in:
parent
c54c76755f
commit
bd3886ed14
@ -16,6 +16,15 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
# Install pip using get-pip
|
||||||
|
EZ_SETUP_URL=https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py
|
||||||
|
PIP_GET_PIP_URL=https://raw.github.com/pypa/pip/master/contrib/get-pip.py
|
||||||
|
|
||||||
|
curl -O $EZ_SETUP_URL
|
||||||
|
python ez_setup.py
|
||||||
|
curl -O $PIP_GET_PIP_URL
|
||||||
|
python get-pip.py
|
||||||
|
|
||||||
# Install puppet version 2.7.x from puppetlabs.
|
# Install puppet version 2.7.x from puppetlabs.
|
||||||
# The repo and preferences files are also managed by puppet, so be sure
|
# The repo and preferences files are also managed by puppet, so be sure
|
||||||
# to keep them in sync with this file.
|
# to keep them in sync with this file.
|
||||||
|
@ -5,12 +5,12 @@
|
|||||||
class openstack_project::params {
|
class openstack_project::params {
|
||||||
case $::osfamily {
|
case $::osfamily {
|
||||||
'RedHat': {
|
'RedHat': {
|
||||||
$packages = ['puppet', 'python-setuptools', 'wget']
|
$packages = ['puppet', 'wget']
|
||||||
$user_packages = ['byobu', 'emacs-nox']
|
$user_packages = ['byobu', 'emacs-nox']
|
||||||
$update_pkg_list_cmd = ''
|
$update_pkg_list_cmd = ''
|
||||||
}
|
}
|
||||||
'Debian': {
|
'Debian': {
|
||||||
$packages = ['puppet', 'python-setuptools', 'wget']
|
$packages = ['puppet', 'wget']
|
||||||
$user_packages = ['byobu', 'emacs23-nox']
|
$user_packages = ['byobu', 'emacs23-nox']
|
||||||
$update_pkg_list_cmd = 'apt-get update >/dev/null 2>&1;'
|
$update_pkg_list_cmd = 'apt-get update >/dev/null 2>&1;'
|
||||||
}
|
}
|
||||||
|
@ -7,9 +7,4 @@ class pip {
|
|||||||
ensure => present,
|
ensure => present,
|
||||||
}
|
}
|
||||||
|
|
||||||
package { $::pip::params::python_pip_package:
|
|
||||||
ensure => present,
|
|
||||||
require => Package[$::pip::params::python_devel_package]
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -6,13 +6,11 @@ class pip::params {
|
|||||||
case $::osfamily {
|
case $::osfamily {
|
||||||
'RedHat': {
|
'RedHat': {
|
||||||
$python_devel_package = 'python-devel'
|
$python_devel_package = 'python-devel'
|
||||||
$python_pip_package = 'python-pip'
|
|
||||||
$python3_devel_package = 'python3-devel'
|
$python3_devel_package = 'python3-devel'
|
||||||
$python3_pip_package = 'python3-pip'
|
$python3_pip_package = 'python3-pip'
|
||||||
}
|
}
|
||||||
'Debian': {
|
'Debian': {
|
||||||
$python_devel_package = 'python-all-dev'
|
$python_devel_package = 'python-all-dev'
|
||||||
$python_pip_package = 'python-pip'
|
|
||||||
$python3_devel_package = 'python3-all-dev'
|
$python3_devel_package = 'python3-all-dev'
|
||||||
$python3_pip_package = 'python3-pip'
|
$python3_pip_package = 'python3-pip'
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user