Merge branch 'master' into vlowther-barclamp-pkg-metadata

Conflicts: barclamps/deployer
dellcloudedge · Jan 25, 2012 · 3b2c9a2 · 3b2c9a2
2 parents 3b485a1 + 7b6f517
commit 3b2c9a2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/barclamps/crowbar b/barclamps/crowbar
diff --git a/barclamps/deployer b/barclamps/deployer
diff --git a/barclamps/network b/barclamps/network
diff --git a/redhat-common/chef_install_lib.sh b/redhat-common/chef_install_lib.sh
@@ -71,6 +71,8 @@ bring_up_chef() {
     cp -f patches/kwalify /usr/bin/kwalify
     cp -f patches/rake /usr/bin/rake
 
+    # increase chef-solr index field size
+    perl -i -ne 'if ($_ =~ /<maxFieldLength>(.*)<\/maxFieldLength>/){ print "<maxFieldLength>200000</maxFieldLength> \n" } else { print } '  /var/chef/solr/conf/solrconfig.xml
     log_to svc service chef-server restart
 }