File tree Expand file tree Collapse file tree 7 files changed +17
-7
lines changed Expand file tree Collapse file tree 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:
8686* [ ` manage_venv_package ` ] ( #-python--manage_venv_package )
8787* [ ` manage_pip_package ` ] ( #-python--manage_pip_package )
8888* [ ` venv ` ] ( #-python--venv )
89+ * [ ` pip_package_name ` ] ( #-python--pip_package_name )
8990* [ ` gunicorn_package_name ` ] ( #-python--gunicorn_package_name )
9091* [ ` python_pips ` ] ( #-python--python_pips )
9192* [ ` python_pyvenvs ` ] ( #-python--python_pyvenvs )
@@ -228,6 +229,14 @@ Data type: `Python::Package::Ensure`
228229
229230Default value: ` 'absent' `
230231
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+
231240##### <a name =" -python--gunicorn_package_name " ></a >` gunicorn_package_name `
232241
233242Data type: ` String[1] `
Original file line number Diff line number Diff line change 7676 }
7777 }
7878
79-
8079 contain python::install
8180 contain python::config
8281
Original file line number Diff line number Diff line change 1515 }
1616 ' anaconda' : {
1717 }
18- pip, default: {
18+ ' pip' , default: {
1919 case $facts [' os' ][' family' ] {
2020 ' AIX' : {
2121 unless String($python::version ) =~ /^python3/ {
Original file line number Diff line number Diff line change 33 include python
44
55 # 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 ' ] {
77 package { 'python-venv' :
88 ensure => $python::venv ,
99 name => " ${python::install::python} -venv" ,
Original file line number Diff line number Diff line change 4040 }
4141 $manage_venv_package = $facts [' os' ][' family' ] ? {
4242 ' Archlinux' => false ,
43+ ' FreeBSD' => false ,
44+ ' RedHat' => false ,
4345 default => true ,
4446 }
4547}
Original file line number Diff line number Diff line change @@ -26,7 +26,7 @@ class { 'python':
2626 PP
2727 end
2828
29- if %w[ Archlinux RedHat FreeBSD ] . include? ( facts [ :os ] [ 'family' ] )
29+ if %w[ Archlinux FreeBSD RedHat ] . include? ( facts [ :os ] [ 'family' ] )
3030 it { is_expected . not_to contain_package ( 'python-venv' ) }
3131 else
3232 it { is_expected . to contain_package ( 'python-venv' ) . with ( ensure : 'present' ) }
Original file line number Diff line number Diff line change 1616 context 'when ensuring pip is absent' do
1717 let ( :pre_condition ) do
1818 <<~PP
19- class { 'python':
20- pip => absent,
21- }
19+ class { 'python':
20+ pip => absent,
21+ }
2222 PP
2323 end
2424
You can’t perform that action at this time.
0 commit comments