Skip to content
Browse files

standardized recipe names across cookbooks (jenkins, zabbix and mongo…

… are still a holy mess). See notes/renamed-recipes.txt for details. Untangled some include_recipe chains. Fixes to graphite and ganglia recipes. Made the things that want a sun java a) complain uniformly, and b) accept 'sun' or 'oracle' as the java_flavor
  • Loading branch information...
1 parent f798d3f commit 8f326126a918e6a75ab36f577d3fe0a4da439e66 Philip (flip) Kromer committed Feb 20, 2012
Showing with 33 additions and 30 deletions.
  1. +29 −26 clusters/el_ridiculoso.rb
  2. +1 −1 clusters/elasticsearch_demo.rb
  3. +1 −1 clusters/hbase_demo.rb
  4. +1 −1 notes
  5. +1 −1 vendor/ironfan-pantry
View
55 clusters/el_ridiculoso.rb
@@ -27,6 +27,7 @@
role :volumes
role :package_set
role :minidash, :last
+ # role :set_hostname
role :org_base
role :org_final, :last
@@ -42,41 +43,48 @@ module ElRidiculoso
module_function
def master_processes
role :cassandra_server
- # role :elasticsearch_data_esnode
- # role :elasticsearch_http_esnode
- role :zookeeper_server
+ role :elasticsearch_data_esnode
+ role :elasticsearch_http_esnode
role :flume_master
role :ganglia_master
- role :hadoop_namenode
+ role :graphite_server
role :hadoop_jobtracker
+ role :hadoop_namenode
role :hadoop_secondarynn
role :hbase_master
+ # role :jenkins_server
+ role :mongodb_server
+ role :mysql_server
role :redis_server
- # role :statsd_server
- # role :mongodb_server
- # role :mysql_server
- # role :graphite_server
- # role :resque_server
+ role :resque_server
+ role :statsd_server
+ # role :zabbix_server
+ # role :zabbix_web
+ role :zookeeper_server
# These run stuff even though they shouldn't
recipe 'apache2'
- recipe 'nginx'
+ # recipe 'nginx'
end
def worker_processes
- role :hadoop_datanode
- role :hadoop_tasktracker
role :flume_agent
role :ganglia_agent
+ role :hadoop_datanode
+ role :hadoop_tasktracker
role :hbase_regionserver
role :hbase_stargate
+ role :hbase_thrift
+ # role :jenkins_worker
end
def client_processes
- role :mysql_client
- role :redis_client
role :cassandra_client
role :elasticsearch_client
+ role :hbase_client
+ role :mysql_client
role :nfs_client
+ role :redis_client
+ role :zookeeper_client
end
def simple_installs
@@ -110,10 +118,10 @@ def simple_installs
extend ElRidiculoso
instances 1
- # master_processes
- # worker_processes
- # client_processes
- # simple_installs
+ master_processes
+ worker_processes
+ client_processes
+ simple_installs
end
facet :jefe do
@@ -135,22 +143,16 @@ def simple_installs
end
cluster_role.override_attributes({
- :hadoop => {
- :java_heap_size_max => 128,
- },
- })
-
- cluster_role.override_attributes({
:apache => {
- :server => { :run_state => :stop }, },
+ :server => { :run_state => [:stop, :disable] }, },
:cassandra => { :run_state => :stop },
:chef => {
:client => { :run_state => :stop },
:server => { :run_state => :stop }, },
:elasticsearch => { :run_state => :stop },
:flume => {
:master => { :run_state => :stop },
- :node => { :run_state => :stop }, },
+ :agent => { :run_state => :stop }, },
:ganglia => {
:agent => { :run_state => :stop },
:server => { :run_state => :stop }, },
@@ -159,6 +161,7 @@ def simple_installs
:whisper => { :run_state => :stop },
:dashboard => { :run_state => :stop }, },
:hadoop => {
+ :java_heap_size_max => 128,
:namenode => { :run_state => :stop },
:secondarynn => { :run_state => :stop },
:jobtracker => { :run_state => :stop },
View
2 clusters/elasticsearch_demo.rb
@@ -30,7 +30,7 @@
recipe 'volumes::build_raid', :first
recipe 'tuning'
#
- recipe 'elasticsearch::default'
+ recipe 'elasticsearch'
recipe 'elasticsearch::install_from_release'
recipe 'elasticsearch::install_plugins'
recipe 'elasticsearch::server'
View
2 clusters/hbase_demo.rb
@@ -74,7 +74,7 @@ def hbase_facet(*components, &block)
role :jruby
role :pig
recipe 'hadoop_cluster::config_files', :last
- recipe 'hbase::config', :last
+ recipe 'hbase::config_files', :last
[:nn, :jt, :nn2, :tt, :dn, :hm, :hm2, :rs, :hbth, :hbsg, :zk ]
2 notes
@@ -1 +1 @@
-Subproject commit f5a30b864180dd77302c9d1bb9c06fb17a17f9bf
+Subproject commit 2a256ecdc50488183aa325e6a392ce32d2bce68c
2 vendor/ironfan-pantry
@@ -1 +1 @@
-Subproject commit aa7ef2b3305741d75a438ea6f231019365c3b3c2
+Subproject commit d77a19d286858ab9f142223c251582684ec3c4ca

0 comments on commit 8f32612

Please sign in to comment.
Something went wrong with that request. Please try again.