File tree 7 files changed +17
-7
lines changed
7 files changed +17
-7
lines changed Original file line number Diff line number Diff line change @@ -86,6 +86,7 @@ The following parameters are available in the `python` class:
86
86
* [ ` manage_venv_package ` ] ( #-python--manage_venv_package )
87
87
* [ ` manage_pip_package ` ] ( #-python--manage_pip_package )
88
88
* [ ` venv ` ] ( #-python--venv )
89
+ * [ ` pip_package_name ` ] ( #-python--pip_package_name )
89
90
* [ ` gunicorn_package_name ` ] ( #-python--gunicorn_package_name )
90
91
* [ ` python_pips ` ] ( #-python--python_pips )
91
92
* [ ` python_pyvenvs ` ] ( #-python--python_pyvenvs )
@@ -228,6 +229,14 @@ Data type: `Python::Package::Ensure`
228
229
229
230
Default value: ` 'absent' `
230
231
232
+ ##### <a name =" -python--pip_package_name " ></a >` pip_package_name `
233
+
234
+ Data type: ` Optional[String[1]] `
235
+
236
+
237
+
238
+ Default value: ` undef `
239
+
231
240
##### <a name =" -python--gunicorn_package_name " ></a >` gunicorn_package_name `
232
241
233
242
Data type: ` String[1] `
Original file line number Diff line number Diff line change 76
76
}
77
77
}
78
78
79
-
80
79
contain python::install
81
80
contain python::config
82
81
Original file line number Diff line number Diff line change 15
15
}
16
16
' anaconda' : {
17
17
}
18
- pip, default: {
18
+ ' pip' , default: {
19
19
case $facts [' os' ][' family' ] {
20
20
' AIX' : {
21
21
unless String($python::version ) =~ /^python3/ {
Original file line number Diff line number Diff line change 3
3
include python
4
4
5
5
# Main python package bundle venv on some operating systems
6
- unless $facts [' os' ][' family' ] in [' Archlinux' , ' RedHat ' , ' FreeBSD ' ] {
6
+ unless $facts [' os' ][' family' ] in [' Archlinux' , ' FreeBSD ' , ' RedHat ' ] {
7
7
package { 'python-venv' :
8
8
ensure => $python::venv ,
9
9
name => " ${python::install::python} -venv" ,
Original file line number Diff line number Diff line change 40
40
}
41
41
$manage_venv_package = $facts [' os' ][' family' ] ? {
42
42
' Archlinux' => false ,
43
+ ' FreeBSD' => false ,
44
+ ' RedHat' => false ,
43
45
default => true ,
44
46
}
45
47
}
Original file line number Diff line number Diff line change @@ -26,7 +26,7 @@ class { 'python':
26
26
PP
27
27
end
28
28
29
- if %w[ Archlinux RedHat FreeBSD ] . include? ( facts [ :os ] [ 'family' ] )
29
+ if %w[ Archlinux FreeBSD RedHat ] . include? ( facts [ :os ] [ 'family' ] )
30
30
it { is_expected . not_to contain_package ( 'python-venv' ) }
31
31
else
32
32
it { is_expected . to contain_package ( 'python-venv' ) . with ( ensure : 'present' ) }
Original file line number Diff line number Diff line change 16
16
context 'when ensuring pip is absent' do
17
17
let ( :pre_condition ) do
18
18
<<~PP
19
- class { 'python':
20
- pip => absent,
21
- }
19
+ class { 'python':
20
+ pip => absent,
21
+ }
22
22
PP
23
23
end
24
24
You can’t perform that action at this time.
0 commit comments