From b120a00bd307ebb9edc392f9700b8f29923041c5 Mon Sep 17 00:00:00 2001
From: Elizabeth Krumbach Joseph <lyz@princessleia.com>
Date: Thu, 20 Mar 2014 09:10:20 -0700
Subject: [PATCH] Fix Fedora Puppet failure to use pip
In Fedora the pip command used by the packaged python-pip is
"pip-python" rather than "pip" due to a naming conflict. The
Puppet module tries to compensate, but we don't use the Fedora
package, so the command really is "pip" for us.
Adding symlink line to install_puppet.sh for Fedora to add the
pip-python command that Puppet is looking for.
Change-Id: I60a03fb6c27a18cd8a536080bcce1baaba965237
---
install_puppet.sh | 3 +++
1 file changed, 3 insertions(+)
diff --git a/install_puppet.sh b/install_puppet.sh
index ed9335b6d6..ad18bf477a 100755
--- a/install_puppet.sh
+++ b/install_puppet.sh
@@ -41,6 +41,9 @@ if cat /etc/*release | grep -e "Fedora" &> /dev/null; then
mkdir -p /etc/puppet/modules/
ln -s /usr/local/share/gems/gems/hiera-puppet-* /etc/puppet/modules/
+ # Puppet is expecting the command to be pip-python on Fedora
+ ln -s /usr/bin/pip /usr/bin/pip-python
+
elif cat /etc/*release | grep -e "CentOS" -e "Red Hat" &> /dev/null; then
rpm -qi epel-release &> /dev/null || rpm -Uvh http://download.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm
rpm -ivh http://yum.puppetlabs.com/el/6/products/x86_64/puppetlabs-release-6-6.noarch.rpm