opendev
/
puppet-zuul
Code Issues Proposed changes

Don't install python-yaml package 

PyYAML is already a dependency of zuul, so the distro package doesn't
need to be installed. This attempts to clean pip10 issues with OS
packages.

Change-Id: Ia17aa61ab3c153c82aeae7b99747d142dd75ff61
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2018-07-20 20:50:55 -04:00
parent 707d10f47c
commit 7b94b3c7fc
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/init.pp
View File

@ -138,14 +138,6 @@ class zuul (
}
}
# A lot of things need yaml, be conservative requiring this package to avoid
# conflicts with other modules.
if ! defined(Package['python-yaml']) {
package { 'python-yaml':
ensure => present,
}
}
if ! defined(Package['python-paramiko']) {
package { 'python-paramiko':
ensure => present,
@ -212,7 +204,6 @@ class zuul (
Exec['install_zuul'] -> Package['python-daemon']
Exec['install_zuul'] -> Package['python-lxml']
Exec['install_zuul'] -> Package['python-paramiko']
Exec['install_zuul'] -> Package['python-yaml']
Exec['install_zuul'] -> Package['yui-compressor']
}