File tree Expand file tree Collapse file tree 3 files changed +15
-4
lines changed Expand file tree Collapse file tree 3 files changed +15
-4
lines changed Original file line number Diff line number Diff line change 1
1
# Make pip version available as a fact
2
2
# Works with pip loaded and without, pip installed using pip and package installed
3
3
require 'puppet'
4
- pkg = Puppet ::Type . type ( :package ) . new ( :name => "python-pip" )
4
+ if Gem ::Version . new ( Facter . value ( :puppetversion ) ) >= Gem ::Version . new ( '3.6' )
5
+ pkg = Puppet ::Type . type ( :package ) . new ( :name => 'python-pip' , :allow_virtual => 'false' )
6
+ else
7
+ pkg = Puppet ::Type . type ( :package ) . new ( :name => 'python-pip' )
8
+ end
5
9
Facter . add ( "pip_version" ) do
6
10
has_weight 100
7
11
setcode do
Original file line number Diff line number Diff line change 1
1
# Make python versions available as facts
2
2
# In lists default python and system python versions
3
3
require 'puppet'
4
- pkg = Puppet ::Type . type ( :package ) . new ( :name => "python" )
5
-
4
+ if Gem ::Version . new ( Facter . value ( :puppetversion ) ) >= Gem ::Version . new ( '3.6' )
5
+ pkg = Puppet ::Type . type ( :package ) . new ( :name => 'python' , :allow_virtual => 'false' )
6
+ else
7
+ pkg = Puppet ::Type . type ( :package ) . new ( :name => 'python' )
8
+ end
6
9
Facter . add ( "system_python_version" ) do
7
10
setcode do
8
11
begin
Original file line number Diff line number Diff line change 1
1
# Make virtualenv version available as a fact
2
2
# Works with virualenv loaded and without, pip installed and package installed
3
3
require 'puppet'
4
- pkg = Puppet ::Type . type ( :package ) . new ( :name => "virtualenv" )
4
+ if Gem ::Version . new ( Facter . value ( :puppetversion ) ) >= Gem ::Version . new ( '3.6' )
5
+ pkg = Puppet ::Type . type ( :package ) . new ( :name => 'virtualenv' , :allow_virtual => 'false' )
6
+ else
7
+ pkg = Puppet ::Type . type ( :package ) . new ( :name => 'virtualenv' )
8
+ end
5
9
Facter . add ( "virtualenv_version" ) do
6
10
has_weight 100
7
11
setcode do
You can’t perform that action at this time.
0 commit comments