solr: Update pysolr, add requests dependency
This commit is contained in:
parent
bda0cb174a
commit
e952bc4920
2 changed files with 31 additions and 9 deletions
|
@ -198,16 +198,29 @@ class solr {
|
|||
}
|
||||
}
|
||||
|
||||
if !$pysolr_package {
|
||||
if $pysolr_package_latest {
|
||||
$pysolr_package = $pysolr_package_latest
|
||||
if !$solr_requests_package {
|
||||
if $solr_requests_package_latest {
|
||||
$solr_requests_package = $solr_requests_package_latest
|
||||
} else {
|
||||
fail("Must define \$pysolr_package or \$pysolr_package_latest")
|
||||
fail("Must define \$solr_requests_package or \$solr_requests_package_latest")
|
||||
}
|
||||
}
|
||||
|
||||
if !$solr_pysolr_package {
|
||||
if $solr_pysolr_package_latest {
|
||||
$solr_pysolr_package = $solr_pysolr_package_latest
|
||||
} else {
|
||||
fail("Must define \$solr_pysolr_package or \$solr_pysolr_package_latest")
|
||||
}
|
||||
}
|
||||
|
||||
python::setup::install { "/usr/local/src/requests":
|
||||
source => "puppet:///files/packages/${solr_requests_package}",
|
||||
}
|
||||
|
||||
python::setup::install { "/usr/local/src/pysolr":
|
||||
source => "puppet:///files/packages/${pysolr_package}",
|
||||
source => "puppet:///files/packages/${solr_pysolr_package}",
|
||||
require => Python::Setup::Install["/usr/local/src/requests"],
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue