From bd3886ed146f579aebd0afad549e63f16f14be92 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Wed, 18 Dec 2013 19:55:12 +0000
Subject: [PATCH] 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
---
 install_puppet.sh                             | 9 +++++++++
 modules/openstack_project/manifests/params.pp | 4 ++--
 modules/pip/manifests/init.pp                 | 5 -----
 modules/pip/manifests/params.pp               | 2 --
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/install_puppet.sh b/install_puppet.sh
index 7443dedea7..153a4c3432 100755
--- a/install_puppet.sh
+++ b/install_puppet.sh
@@ -16,6 +16,15 @@
 # License for the specific language governing permissions and limitations
 # 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.
 # The repo and preferences files are also managed by puppet, so be sure
 # to keep them in sync with this file.
diff --git a/modules/openstack_project/manifests/params.pp b/modules/openstack_project/manifests/params.pp
index 6f3d0ef4f0..0a098f6894 100644
--- a/modules/openstack_project/manifests/params.pp
+++ b/modules/openstack_project/manifests/params.pp
@@ -5,12 +5,12 @@
 class openstack_project::params {
   case $::osfamily {
     'RedHat': {
-      $packages = ['puppet', 'python-setuptools', 'wget']
+      $packages = ['puppet', 'wget']
       $user_packages = ['byobu', 'emacs-nox']
       $update_pkg_list_cmd = ''
     }
     'Debian': {
-      $packages = ['puppet', 'python-setuptools', 'wget']
+      $packages = ['puppet', 'wget']
       $user_packages = ['byobu', 'emacs23-nox']
       $update_pkg_list_cmd = 'apt-get update >/dev/null 2>&1;'
     }
diff --git a/modules/pip/manifests/init.pp b/modules/pip/manifests/init.pp
index 7fc0605daa..731691ed58 100644
--- a/modules/pip/manifests/init.pp
+++ b/modules/pip/manifests/init.pp
@@ -7,9 +7,4 @@ class pip {
     ensure => present,
   }
 
-  package { $::pip::params::python_pip_package:
-    ensure  => present,
-    require => Package[$::pip::params::python_devel_package]
-  }
-
 }
diff --git a/modules/pip/manifests/params.pp b/modules/pip/manifests/params.pp
index 856047d532..3bd4f86308 100644
--- a/modules/pip/manifests/params.pp
+++ b/modules/pip/manifests/params.pp
@@ -6,13 +6,11 @@ class pip::params {
   case $::osfamily {
     'RedHat': {
       $python_devel_package = 'python-devel'
-      $python_pip_package   = 'python-pip'
       $python3_devel_package = 'python3-devel'
       $python3_pip_package   = 'python3-pip'
     }
     'Debian': {
       $python_devel_package  = 'python-all-dev'
-      $python_pip_package    = 'python-pip'
       $python3_devel_package = 'python3-all-dev'
       $python3_pip_package   = 'python3-pip'
     }