Skip to content

Commit

Permalink
Patch to support Centos 7 in bootstrap
Browse files Browse the repository at this point in the history
Bootstrapping currently repeats on every run due to the `creates => '/usr/local/bin/pip'`
Centos 7(and possibly others) which place pip executable in /usr/bin/pip
The repeated bootstrap needs to be patched to avoid nodes constantly grabbing the get_pip.py which includes a binary blob.

This patching looks to have been attempted before but failed to include `path => ....` which would support finding `which` in any of those locations as well as allowing `which pip` to only look in the supplied path, basically extending our creates to support multiple locations of pip.
  • Loading branch information
asasfu authored Aug 4, 2016
1 parent 066b31f commit 89d5a23
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion manifests/install.pp
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@
# Install pip without pip, see https://pip.pypa.io/en/stable/installing/.
exec { 'bootstrap pip':
command => '/usr/bin/curl https://bootstrap.pypa.io/get-pip.py | python',
creates => '/usr/local/bin/pip',
unless => 'which pip',
path => [ '/bin', '/usr/bin', '/usr/local/bin' ],
require => Package['python'],
}

Expand Down

0 comments on commit 89d5a23

Please sign in to comment.