Stop installing python depends from distro

Mixing distro and non-distro packages tends to equal unhappy.

Change-Id: I4fa88bdb10e8cb76694f4d04d3239b38f445868a
This commit is contained in:
Monty Taylor 2017-09-19 12:07:43 -05:00
parent edceffecfa
commit 604504fd98
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
1 changed files with 18 additions and 8 deletions

View File

@ -9,9 +9,7 @@ class jeepyb (
case $::osfamily { case $::osfamily {
'Debian': { 'Debian': {
$jeepyb_packages = [ $jeepyb_packages = [
'python-paramiko',
'gcc', 'gcc',
'python-yaml',
'libxml2-dev', 'libxml2-dev',
'libxslt1-dev', 'libxslt1-dev',
'libffi-dev', 'libffi-dev',
@ -32,12 +30,18 @@ class jeepyb (
Package['libssl-dev'], Package['libssl-dev'],
) )
$remove_packages = [
'python-paramiko',
'python-yaml',
]
package { $remove_packages:
ensure => absent,
}
} }
'RedHat': { 'RedHat': {
$jeepyb_packages = [ $jeepyb_packages = [
'python-paramiko',
'gcc', 'gcc',
'PyYAML',
'libxml2-devel', 'libxml2-devel',
'libxslt-devel', 'libxslt-devel',
'libffi-devel', 'libffi-devel',
@ -49,15 +53,21 @@ class jeepyb (
} }
realize ( realize (
Package['python-paramiko'],
Package['gcc'], Package['gcc'],
Package['PyYAML'],
Package['libxml2-devel'], Package['libxml2-devel'],
Package['libxslt-devel'], Package['libxslt-devel'],
Package['libffi-devel'], Package['libffi-devel'],
Package['openssl-devel'], Package['openssl-devel'],
) )
$remove_packages = [
'python-paramiko',
'PyYAML',
]
package { $remove_packages:
ensure => absent,
}
} }
default: { default: {
fail("Unsupported osfamily: ${::osfamily} The 'jeepyb' module only supports osfamily Debian or RedHat.") fail("Unsupported osfamily: ${::osfamily} The 'jeepyb' module only supports osfamily Debian or RedHat.")
@ -75,8 +85,8 @@ class jeepyb (
command => 'pip install -U /opt/jeepyb', command => 'pip install -U /opt/jeepyb',
path => '/usr/local/bin:/usr/bin:/bin/', path => '/usr/local/bin:/usr/bin:/bin/',
refreshonly => true, refreshonly => true,
subscribe => Vcsrepo['/opt/jeepyb'], subscribe => [Vcsrepo['/opt/jeepyb'], Package[$remove_packages]],
logoutput => true, logoutput => true,
require => Package[$jeepyb_packages] require => [Package[$jeepyb_packages], Package[$remove_packages]]
} }
} }