Check definition of package resources
bug 1195162 Tempest is installing some very common packages which are likely to conflict with other modules. This patch checks to see if the resources are already defined, which will prevent compile time errors relating to duplicate resources. Change-Id: I9b4eb46ec0b9affb905e19a034a26d16e01119e2
This commit is contained in:
@@ -50,14 +50,34 @@ class tempest(
|
||||
|
||||
include 'tempest::params'
|
||||
|
||||
package { [
|
||||
'git',
|
||||
'python-pip',
|
||||
$tempest::params::python_dev,
|
||||
$tempest::params::libxslt_dev,
|
||||
$tempest::params::libxml2_dev,
|
||||
]:
|
||||
ensure => present,
|
||||
if ! defined(Package['git']){
|
||||
package {'git':
|
||||
ensure => present,
|
||||
}
|
||||
}
|
||||
|
||||
if ! defined(Package['python-pip']){
|
||||
package {'python-pip':
|
||||
ensure => present,
|
||||
}
|
||||
}
|
||||
|
||||
if ! defined(Package[$tempest::params::python_dev]){
|
||||
package {$tempest::params::python_dev:
|
||||
ensure => present,
|
||||
}
|
||||
}
|
||||
|
||||
if ! defined(Package[$tempest::params::libxslt_dev]){
|
||||
package {$tempest::params::libxslt_dev:
|
||||
ensure => present,
|
||||
}
|
||||
}
|
||||
|
||||
if ! defined(Package[$tempest::params::libxml2_dev]){
|
||||
package {$tempest::params::libxml2_dev:
|
||||
ensure => present,
|
||||
}
|
||||
}
|
||||
|
||||
exec { '/usr/bin/pip-python install -U pip':
|
||||
|
Reference in New Issue
Block a user