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:
parent
707d10f47c
commit
7b94b3c7fc
|
@ -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']
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue