opendev/system-config
Code Issues Proposed changes

Merge "Do not fail the install_puppet.sh on 2th run"

Browse Source
This commit is contained in:
Jenkins 2014-08-19 09:43:47 +00:00 committed by Gerrit Code Review
commit 745344d4bb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
install_puppet.sh
View File

@ -74,13 +74,13 @@ function setup_puppet_fedora {
ln -s /usr/local/share/gems/gems/hiera-puppet-* /etc/puppet/modules/ ln -s /usr/local/share/gems/gems/hiera-puppet-* /etc/puppet/modules/
fi fi
# Puppet expects for an expects the command to be pip-python on # Puppet expects the pip command named as pip-python on
# Fedora, as per the packaged command name. However, we're # Fedora, as per the packaged command name. However, we're
# installing from get-pip.py so it's just 'pip'. An easy # installing from get-pip.py so it's just 'pip'. An easy
# work-around is to just symlink pip-python to "fool" it. # work-around is to just symlink pip-python to "fool" it.
# See upstream issue: # See upstream issue:
# https://tickets.puppetlabs.com/browse/PUP-1082 # https://tickets.puppetlabs.com/browse/PUP-1082
ln -s /usr/bin/pip /usr/bin/pip-python ln -fs /usr/bin/pip /usr/bin/pip-python
} }
function setup_puppet_rhel7 { function setup_puppet_rhel7 {