Updated Branches:
  refs/heads/master 87e5388aa -> b3d388b59

BIGTOP-778. move Solr app to under /solr in Tomcat deployment and provide more 
knobs


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/b3d388b5
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/b3d388b5
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/b3d388b5

Branch: refs/heads/master
Commit: b3d388b5984070509f6e0420e5f452f036f017a1
Parents: 87e5388
Author: Roman Shaposhnik <[email protected]>
Authored: Wed Dec 5 14:22:17 2012 -0800
Committer: Roman Shaposhnik <[email protected]>
Committed: Wed Dec 5 14:22:36 2012 -0800

----------------------------------------------------------------------
 .../puppet/modules/solr/manifests/init.pp          |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/b3d388b5/bigtop-deploy/puppet/modules/solr/manifests/init.pp
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/solr/manifests/init.pp 
b/bigtop-deploy/puppet/modules/solr/manifests/init.pp
index 6695f84..9163ce9 100644
--- a/bigtop-deploy/puppet/modules/solr/manifests/init.pp
+++ b/bigtop-deploy/puppet/modules/solr/manifests/init.pp
@@ -16,7 +16,7 @@
 class solr {
   define solrcloud_config($confdir, $zk) {
     exec { "ZK $title config upload":
-      command => "/usr/bin/java -classpath 
'/usr/lib/solr/server/webapps/ROOT/WEB-INF/lib/*' org.apache.solr.cloud.ZkCLI 
-cmd upconfig  -confdir ${confdir}/${title}/conf -confname $title -zkhost $zk",
+      command => "/bin/bash -c \"java -classpath 
'/usr/lib/solr/server/webapps/solr/WEB-INF/lib/*' org.apache.solr.cloud.ZkCLI 
-cmd makepath /solr -zkhost ${zk} ; java -classpath 
'/usr/lib/solr/server/webapps/solr/WEB-INF/lib/*' org.apache.solr.cloud.ZkCLI 
-cmd upconfig  -confdir ${confdir}/${title}/conf -confname $title -zkhost 
${zk}/solr\"",
       logoutput => true,
     }
   }

Reply via email to