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

[develop] python-crypto obsoleted by python2-crypto on RHEL / CentOS 7 #247

Merged
merged 2 commits into from
Feb 9, 2016
Merged

[develop] python-crypto obsoleted by python2-crypto on RHEL / CentOS 7 #247

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
7e519ce
python-crypto is obsoleted on RHEL7 - #243
madAndroid Feb 9, 2016
91e2234
python-crypto is obsoleted on RHEL7 - #243
madAndroid Feb 9, 2016
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
5 changes: 2 additions & 3 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@
$common_os_pkgs = [
'MySQL-python',
'pyOpenSSL',
'python-crypto',
'python-ldap',
'python-memcached',
'python-psycopg2',
Expand All @@ -107,12 +106,12 @@
case $::operatingsystemrelease {
/^6\.\d+$/: {
$apache_24 = false
$graphitepkgs = union($common_os_pkgs,['python-sqlite2', 'bitmap-fonts-compat', 'bitmap', 'pycairo'])
$graphitepkgs = union($common_os_pkgs,['python-sqlite2', 'bitmap-fonts-compat', 'bitmap', 'pycairo','python-crypto'])
}

/^7\.\d+/: {
$apache_24 = true
$graphitepkgs = union($common_os_pkgs,['python-sqlite3dbm', 'dejavu-fonts-common', 'dejavu-sans-fonts', 'python-cairocffi'])
$graphitepkgs = union($common_os_pkgs,['python-sqlite3dbm', 'dejavu-fonts-common', 'dejavu-sans-fonts', 'python-cairocffi','python2-crypto'])
}

default: {
Expand Down
3 changes: 2 additions & 1 deletion spec/classes/install_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
it { should contain_package('gcc').with_provider(nil) }
it { should contain_package('MySQL-python').with_provider(nil) }
it { should contain_package('pyOpenSSL').with_provider(nil) }
it { should contain_package('python-crypto').with_provider(nil) }
it { should contain_package('python-memcached').with_provider(nil) }
it { should contain_package('python-zope-interface').with_provider(nil) }
end
Expand All @@ -73,6 +72,7 @@
it { should contain_package('python-sqlite2').with_provider(nil) }
it { should contain_package('bitmap').with_provider(nil) }
it { should contain_package('bitmap-fonts-compat').with_provider(nil) }
it { should contain_package('python-crypto').with_provider(nil) }

it { should contain_file('carbon_hack').only_with(hack_defaults.merge({
:target => '/opt/graphite/lib/carbon-0.9.15-py2.6.egg-info',
Expand All @@ -90,6 +90,7 @@
it { should contain_package('python-sqlite3dbm').with_provider(nil) }
it { should contain_package('dejavu-fonts-common').with_provider(nil) }
it { should contain_package('dejavu-sans-fonts').with_provider(nil) }
it { should contain_package('python2-crypto').with_provider(nil) }

it { should contain_file('carbon_hack').only_with(hack_defaults.merge({
:target => '/opt/graphite/lib/carbon-0.9.15-py2.7.egg-info',
Expand Down