Skip to content
Browse files

bump ironfan version. re-enable some stuff in el_ridiculoso

  • Loading branch information...
1 parent 0ed1df4 commit cddfc963570c992dc5889ec15cc03c26a3bbce1e Philip (flip) Kromer committed
Showing with 9 additions and 8 deletions.
  1. +2 −1 Gemfile
  2. +6 −6 clusters/el_ridiculoso.rb
  3. +1 −1 notes
View
3 Gemfile
@@ -5,7 +5,7 @@ source "http://rubygems.org"
#
gem 'chef', "= 0.10.8"
-gem 'ironfan', "~> 3.1.3"
+gem 'ironfan', "~> 3.1.4"
# # vagrant and chef are being dicks about the version net-ssh should have.
# # to use the knife vagrant stuff you will have to munge the chef gemspec
@@ -20,6 +20,7 @@ group :test do
gem 'rake'
gem 'bundler', "~> 1"
gem 'rspec', "~> 2.5"
+ gem 'redcarpet', "~> 2"
gem 'cucumber', "~> 1.1"
end
View
12 clusters/el_ridiculoso.rb
@@ -52,18 +52,18 @@ def master_processes
role :hadoop_namenode
role :hadoop_secondarynn
role :hbase_master
- # role :jenkins_server
+ role :jenkins_server
role :mongodb_server
role :mysql_server
role :redis_server
role :resque_server
role :statsd_server
- # role :zabbix_server
- # role :zabbix_web
+ role :zabbix_server
+ role :zabbix_web
role :zookeeper_server
- # These run stuff even though they shouldn't
+ # The default recipes for these run stuff even though it's impolite
recipe 'apache2'
- # recipe 'nginx'
+ recipe 'nginx'
end
def worker_processes
@@ -74,7 +74,7 @@ def worker_processes
role :hbase_regionserver
role :hbase_stargate
role :hbase_thrift
- # role :jenkins_worker
+ role :jenkins_worker
end
def client_processes
2 notes
@@ -1 +1 @@
-Subproject commit 54c008a2bb72cb8ccc143169c0772e395ae3bb83
+Subproject commit 7105b806ab3663acdf9175e3bf4f32ec30a77c08

0 comments on commit cddfc96

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