[kateglo] r495 committed - Making Puppet configurable

[kat...@googlecode.com]

Revision: 495
Author: arthur.purnama
Date: Tue Jul 31 06:06:30 2012
Log: Making Puppet configurable
http://code.google.com/p/kateglo/source/detail?r=495

Modified:
/branches/kateglox/.idea/workspace.xml
/branches/kateglox/vagrant/puppet/modules/kateglo/manifests/init.pp

=======================================
--- /branches/kateglox/.idea/workspace.xml Tue Jul 31 04:47:57 2012
+++ /branches/kateglox/.idea/workspace.xml Tue Jul 31 06:06:30 2012
@@ -37,7 +37,7 @@
<file leaf-file-name="init.pp" pinned="false" current="true"
current-in-tab="true">
<entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/manifests/init.pp">
<provider selected="true" editor-type-id="text-editor">
- <state line="233" column="64" selection-start="8491"
selection-end="8491" vertical-scroll-proportion="0.0295858">
+ <state line="233" column="41" selection-start="8457"
selection-end="8457" vertical-scroll-proportion="0.65384614">
<folding />
</state>
</provider>
@@ -667,7 +667,11 @@
<created>1343729324103</created>
<updated>1343729324103</updated>
</task>
- <option name="localTasksCounter" value="16" />
+ <task id="LOCAL-00016" summary="Making Puppet configurable">
+ <created>1343735281103</created>
+ <updated>1343735281103</updated>
+ </task>
+ <option name="localTasksCounter" value="17" />
<servers />
</component>
<component name="TodoView" selected-index="0">
@@ -869,7 +873,7 @@
</entry>
<entry
file="file://$PROJECT_DIR$/vagrant/puppet/modules/kateglo/manifests/init.pp">
<provider selected="true" editor-type-id="text-editor">
- <state line="233" column="64" selection-start="8491"
selection-end="8491" vertical-scroll-proportion="0.0295858">
+ <state line="233" column="41" selection-start="8457"
selection-end="8457" vertical-scroll-proportion="0.65384614">
<folding />
</state>
</provider>
=======================================
--- /branches/kateglox/vagrant/puppet/modules/kateglo/manifests/init.pp Tue
Jul 31 04:47:57 2012
+++ /branches/kateglox/vagrant/puppet/modules/kateglo/manifests/init.pp Tue
Jul 31 06:06:30 2012
@@ -219,21 +219,20 @@
require => File["/etc/default/jetty"],
notify => Service["jetty"],
}
-
- exec {"wait for jetty":
- require => Service["jetty"],
- subscribe => Service["jetty"],
- command => "wget --spider --tries 10 --retry-connrefused
--no-check-certificate http://localhost:8080/solr/",
- }

exec{ "restart jetty":
require => [File["/home/${globalUser}/solr/conf/synonyms.txt"],
File["/home/${globalUser}/solr/conf/stopwords.txt"],
File["/home/${globalUser}/solr/conf/spellings.txt"],
File["/home/${globalUser}/solr/conf/solrconfig.xml"],
File["/home/${globalUser}/solr/conf/schema.xml"],
File["/home/${globalUser}/solr/conf/protwords.txt"],
File["/home/${globalUser}/solr/conf/elevate.xml"],
File["/home/${globalUser}/solr/conf/data-config.xml"],
- Exec["import kateglo dump"], Service["jetty"],
exec["wait for jetty"]],
+ Exec["import kateglo dump"], Service["jetty"]],
command => "sudo service jetty restart",
}
+
+ exec {"wait for jetty":
+ require => [Service["jetty"], Exec["restart jetty"]],
+ command => "wget --spider --tries 50 --retry-connrefused
--no-check-certificate http://localhost:8080/solr/",
+ }

exec { "solr full import":
command => "sudo curl
http://localhost:8080/solr/dataimport?command=full-import",