Skip to content
This repository was archived by the owner on Mar 8, 2023. It is now read-only.

Updated python-pip to python2-pip for RedHat 7 variants #337

Merged
merged 2 commits into from
Jun 14, 2017
Merged

Updated python-pip to python2-pip for RedHat 7 variants #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a80218b
Updated python-pip to python2-pip for RedHat 7 variants
ChrisHirsch Jun 12, 2017
441c3a5
Reformated for proper linting
ChrisHirsch Jun 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,13 @@
$pyopenssl = 'pyOpenSSL'
$apache_wsgi_pkg = 'mod_wsgi'
$pytz = 'python-tzlocal'
$python_pip_pkg = 'python-pip'
$python_pip_pkg = $::osfamily ? {
'RedHat' => $::operatingsystemrelease ? {
/^7/ => 'python2-pip',
default => 'python-pip'
},
default => 'python-pip',
}
}

$python_dev_pkg = ["${python}-devel", 'gcc']
Expand Down
4 changes: 3 additions & 1 deletion spec/classes/graphite_install_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
end

shared_context 'RedHat 7 platforms' do
it { is_expected.to contain_package('python2-pip').with_provider(nil) }
it { is_expected.to contain_package('python-cairocffi').with_provider(nil) }
it { is_expected.to contain_package('Django').with_provider('pip') }
it { is_expected.to contain_package('python-sqlite3dbm').with_provider(nil) }
Expand Down Expand Up @@ -128,11 +129,12 @@
it_behaves_like 'no django'
end
when 'RedHat' then
it_behaves_like 'supported platforms'
#it_behaves_like 'supported platforms'
it_behaves_like 'RedHat supported platforms'

case facts[:operatingsystemrelease]
when /^6/ then
it_behaves_like 'supported platforms'
it_behaves_like 'RedHat 6 platforms'
when /^7/ then
it_behaves_like 'RedHat 7 platforms'
Expand Down