From e952bc492031f5d1bfef00ae3a694e17fdd31d01 Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Wed, 27 Nov 2013 08:22:46 +0200
Subject: [PATCH] solr: Update pysolr, add requests dependency

---
 solr/Makefile          | 17 +++++++++++++----
 solr/manifests/init.pp | 23 ++++++++++++++++++-----
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/solr/Makefile b/solr/Makefile
index 3493226..f79959f 100644
--- a/solr/Makefile
+++ b/solr/Makefile
@@ -5,12 +5,16 @@ VERSION = 4.5.0
 TARGET = solr-$(VERSION).tgz
 SOURCE = http://ftp.funet.fi/pub/mirrors/apache.org/lucene/solr/$(VERSION)/solr-$(VERSION).tgz
 
-PYSOLRVERSION = 2.0.15
+PYSOLRVERSION = 3.1.0
 PYSOLRSOURCE = https://pypi.python.org/packages/source/p/pysolr/pysolr-$(PYSOLRVERSION).tar.gz
 PYSOLRTARGET = pysolr-$(PYSOLRVERSION).tar.gz
 
+REQUESTSVERSION = 2.0.1
+REQUESTSSOURCE = https://pypi.python.org/packages/source/r/requests/requests-$(REQUESTSVERSION).tar.gz
+REQUESTSTARGET = requests-$(REQUESTSVERSION).tar.gz
+
 all:      download manifest
-download: $(PACKAGES)/$(TARGET) $(PACKAGES)/$(PYSOLRTARGET)
+download: $(PACKAGES)/$(TARGET) $(PACKAGES)/$(PYSOLRTARGET) $(PACKAGES)/$(REQUESTSTARGET)
 manifest: $(MANIFESTS)/solr.pp
 
 $(PACKAGES)/$(TARGET):
@@ -21,7 +25,12 @@ $(PACKAGES)/$(PYSOLRTARGET):
 	@umask 022; echo $@; \
 	test -f $@ || curl -f -o $@ $(PYSOLRSOURCE)
 
-$(MANIFESTS)/solr.pp: $(PACKAGES)/$(TARGET) $(PACKAGES)/$(PYSOLRTARGET)
+$(PACKAGES)/$(REQUESTSTARGET):
+	@umask 022; echo $@; \
+	test -f $@ || curl -f -o $@ $(REQUESTSSOURCE)
+
+$(MANIFESTS)/solr.pp: $(PACKAGES)/$(TARGET) $(PACKAGES)/$(PYSOLRTARGET) $(PACKAGES)/$(REQUESTSTARGET)
 	@umask 022; echo $@; \
 	echo '$$solr_package_latest = "$(TARGET)"' > $@ && \
-	echo '$$pysolr_package_latest = "$(PYSOLRTARGET)"' >> $@
+	echo '$$solr_pysolr_package_latest = "$(PYSOLRTARGET)"' >> $@ && \
+	echo '$$solr_requests_package_latest = "$(REQUESTSTARGET)"' >> $@
diff --git a/solr/manifests/init.pp b/solr/manifests/init.pp
index ce361d3..8aa70b0 100644
--- a/solr/manifests/init.pp
+++ b/solr/manifests/init.pp
@@ -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"],
     }
 
 }