Replacing submodule mess with Berkshelf-based cookbook management

infochimps-labs · Nov 13, 2012 · 9de1d58 · 9de1d58
1 parent 90a334e
commit 9de1d58
Show file tree

Hide file tree

Showing 150 changed files with 684 additions and 183 deletions.
diff --git a/.gitignore b/.gitignore
@@ -62,7 +62,8 @@ knife/checksums/*
 knife/plugins
 
 .chef
-vendor/ironfan-enterprise
 vagrants/*
 .rbenv-version
 Gemfile.lock
+Berksfile.lock
+cookbooks/*
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,3 @@
-[submodule "vendor/ironfan-pantry"]
-	path = vendor/ironfan-pantry
-	url = https://github.com/infochimps-labs/ironfan-pantry
-[submodule "vendor/opscode/cookbooks"]
-	path = vendor/opscode/cookbooks
-	url = https://github.com/infochimps-labs/opscode_cookbooks
 [submodule "notes"]
 	path = notes
 	url = https://github.com/infochimps-labs/ironfan.wiki.git
diff --git a/Berksfile b/Berksfile
@@ -0,0 +1,99 @@
+require './config/Berksfile.conf'
+require './config/Berksfile.inc'
+
+opscode_cookbook        'ant'
+opscode_cookbook        'apache2'
+opscode_cookbook        'apt'
+opscode_cookbook        'aws'
+opscode_cookbook        'bluepill'
+opscode_cookbook        'boost'
+opscode_cookbook        'build-essential'
+pantry_cookbook         'cassandra'
+opscode_cookbook        'chef-client'
+opscode_cookbook        'chef_gem'
+opscode_cookbook        'chef-server'
+pantry_cookbook         'cloud_utils'
+opscode_cookbook        'couchdb'
+opscode_cookbook        'cron'
+enterprise_cookbook     'cube'
+opscode_cookbook        'daemontools'
+enterprise_cookbook     'dashpot'
+opscode_cookbook        'database'
+opscode_cookbook        'dmg'
+pantry_cookbook         'elasticsearch'
+opscode_cookbook        'emacs'
+opscode_cookbook        'erlang'
+pantry_cookbook         'firewall'
+pantry_cookbook         'flume'
+pantry_cookbook         'ganglia'
+opscode_cookbook        'gecode'
+opscode_cookbook        'git'
+pantry_cookbook         'graphite'
+pantry_cookbook         'hadoop_cluster'
+pantry_cookbook         'hbase'
+pantry_cookbook         'hive'
+pantry_cookbook         'homebrew'
+pantry_cookbook         'install_from'
+opscode_cookbook        'iptables'
+pantry_cookbook         'iron_cuke'
+enterprise_cookbook     'ironfan_api'
+pantry_cookbook         'ironfan-ci'
+opscode_cookbook        'java'
+pantry_cookbook         'jenkins'
+opscode_cookbook        'jpackage'
+pantry_cookbook         'jruby'
+enterprise_cookbook     'kafka'
+enterprise_cookbook     'log_integration'
+opscode_cookbook        'logrotate'
+opscode_cookbook        'maven'
+pantry_cookbook         'minidash'
+pantry_cookbook         'mongodb'
+pantry_cookbook         'motd'
+opscode_cookbook        'mysql'
+pantry_cookbook         'nfs'
+opscode_cookbook        'nginx'
+pantry_cookbook         'nodejs'
+opscode_cookbook        'ntp'
+opscode_cookbook        'openssh'
+opscode_cookbook        'openssl'
+pantry_cookbook         'package_set'
+pantry_cookbook         'papertrail'
+enterprise_cookbook     'phantomjs'
+pantry_cookbook         'pig'
+opscode_cookbook        'postgresql'
+opscode_cookbook        'python'
+opscode_cookbook        'rabbitmq'
+pantry_cookbook         'redis'
+pantry_cookbook         'resque'
+pantry_cookbook         'route53'
+pantry_cookbook         'rstats'
+opscode_cookbook        'rsyslog'
+enterprise_cookbook     'rundeck'
+opscode_cookbook        'runit'
+pantry_cookbook         'rvm'
+pantry_cookbook         'silverware'
+pantry_cookbook         'snappy'
+pantry_cookbook         'statsd'
+enterprise_cookbook     'storm'
+pantry_cookbook         'strongswan'
+enterprise_cookbook     'sudo'
+opscode_cookbook        'thrift'
+pantry_cookbook         'tuning'
+opscode_cookbook        'ubuntu'
+opscode_cookbook        'ucspi-tcp'
+opscode_cookbook        'ufw'
+opscode_cookbook        'unicorn'
+enterprise_cookbook     'users'
+enterprise_cookbook     'vayacondios'
+pantry_cookbook         'volumes'
+pantry_cookbook         'volumes_ebs'
+opscode_cookbook        'xfs'
+opscode_cookbook        'xml'
+enterprise_cookbook     'xvfb'
+opscode_cookbook        'yum'
+pantry_cookbook         'zabbix'
+enterprise_cookbook     'zabbix_integration'
+pantry_cookbook         'zeromq'
+opscode_cookbook        'zlib'
+pantry_cookbook         'zookeeper'
+opscode_cookbook        'zsh'
diff --git a/Gemfile b/Gemfile
@@ -6,6 +6,8 @@ source "http://rubygems.org"
 
 gem 'chef',            ">= 0.10.8"
 gem 'ironfan',         "~> 4.2"
+gem 'berkshelf',       :git => "git://github.com/temujin9/berkshelf",
+                       :branch => "one_clone_path"
 
 # Everything in the world is being a stupid dick about JSON versions. Pin it to
 # the one that doesn't seem to angrify everyone.

diff --git a/Rakefile b/Rakefile
@@ -58,6 +58,14 @@ Dir[File.join('tasks', '*.rake')].sort.each{|f| load(f) }
 
 load 'chef/tasks/chef_repo.rake'
 
+desc "Install berkshelf cookbooks locally"
+task :berkshelf do |t, args|
+  system("bundle exec berks install --path cookbooks")
+end
+
+desc "Install berkshelf cookbooks and sync with Chef server"
+task :berkshelf_install => [ :berkshelf, :install ]
+
 desc "Bundle a single cookbook for distribution"
 task :bundle_cookbook => [ :metadata ]
 task :bundle_cookbook, :cookbook do |t, args|
@@ -115,7 +123,7 @@ end
 # RSpec::Core::RakeTask.new(:spec) do |spec|
 #   spec.pattern = FileList['spec/**/*_spec.rb']
 # end
-# 
+#
 # RSpec::Core::RakeTask.new(:rcov) do |spec|
 #   spec.pattern = 'spec/**/*_spec.rb'
 #   spec.rcov = true

diff --git a/config/Berksfile.conf.rb b/config/Berksfile.conf.rb
@@ -0,0 +1,2 @@
+USE_LOCAL       = false
+LOCAL_PATH      = "vendor"
diff --git a/config/Berksfile.inc.rb b/config/Berksfile.inc.rb
@@ -0,0 +1,30 @@
+USE_LOCAL       = false                                 if USE_LOCAL.nil?
+LOCAL_PATH      = "vendor"                              if LOCAL_PATH.nil?
+OPSCODE_REPO    = 'infochimps-labs/opscode_cookbooks'   if OPSCODE_REPO.nil?
+PANTRY_REPO     = 'infochimps-labs/ironfan-pantry'      if PANTRY_REPO.nil?
+ENTERPRISE_REPO = 'infochimps/ironfan-enterprise'       if ENTERPRISE_REPO.nil?
+
+def github_cookbook(name, repo, rel)
+  if USE_LOCAL
+    r_name = repo.split('/')[1]
+    cookbook name, path: "#{LOCAL_PATH}/#{r_name}/#{rel}"
+  else
+    cookbook name, github: repo, protocol: 'ssh', rel: rel
+  end
+end
+
+def opscode_cookbook(name)
+  github_cookbook name, OPSCODE_REPO, name
+end
+
+def pantry_cookbook(name)
+  github_cookbook name, PANTRY_REPO, ('cookbooks/' + name)
+end
+
+def enterprise_cookbook(name)
+  github_cookbook name, ENTERPRISE_REPO, ('cookbooks/' + name)
+end
+
+def org_cookbook(name)
+  cookbook name, path: "org_cookbooks"
+end
diff --git a/cookbooks/README.md b/cookbooks/README.md
diff --git a/cookbooks/ant b/cookbooks/ant
diff --git a/cookbooks/apache2 b/cookbooks/apache2
diff --git a/cookbooks/apt b/cookbooks/apt
diff --git a/cookbooks/aws b/cookbooks/aws
diff --git a/cookbooks/bluepill b/cookbooks/bluepill
diff --git a/cookbooks/boost b/cookbooks/boost
diff --git a/cookbooks/build-essential b/cookbooks/build-essential
diff --git a/cookbooks/cassandra b/cookbooks/cassandra
diff --git a/cookbooks/chef-client b/cookbooks/chef-client
diff --git a/cookbooks/chef-server b/cookbooks/chef-server
diff --git a/cookbooks/chef_gem b/cookbooks/chef_gem
diff --git a/cookbooks/cloud_utils b/cookbooks/cloud_utils
diff --git a/cookbooks/couchdb b/cookbooks/couchdb
diff --git a/cookbooks/cron b/cookbooks/cron
diff --git a/cookbooks/daemontools b/cookbooks/daemontools
diff --git a/cookbooks/database b/cookbooks/database
diff --git a/cookbooks/dmg b/cookbooks/dmg
diff --git a/cookbooks/elasticsearch b/cookbooks/elasticsearch
diff --git a/cookbooks/emacs b/cookbooks/emacs
diff --git a/cookbooks/erlang b/cookbooks/erlang
diff --git a/cookbooks/firewall b/cookbooks/firewall
diff --git a/cookbooks/flume b/cookbooks/flume
diff --git a/cookbooks/ganglia b/cookbooks/ganglia
diff --git a/cookbooks/gecode b/cookbooks/gecode
diff --git a/cookbooks/git b/cookbooks/git
diff --git a/cookbooks/graphite b/cookbooks/graphite
diff --git a/cookbooks/hadoop_cluster b/cookbooks/hadoop_cluster
diff --git a/cookbooks/hbase b/cookbooks/hbase
diff --git a/cookbooks/hive b/cookbooks/hive
diff --git a/cookbooks/homebrew b/cookbooks/homebrew
diff --git a/cookbooks/install_from b/cookbooks/install_from
diff --git a/cookbooks/iptables b/cookbooks/iptables
diff --git a/cookbooks/iron_cuke b/cookbooks/iron_cuke
diff --git a/cookbooks/ironfan-ci b/cookbooks/ironfan-ci
diff --git a/cookbooks/java b/cookbooks/java
diff --git a/cookbooks/jenkins b/cookbooks/jenkins
diff --git a/cookbooks/jpackage b/cookbooks/jpackage
diff --git a/cookbooks/jruby b/cookbooks/jruby
diff --git a/cookbooks/maven b/cookbooks/maven
diff --git a/cookbooks/minidash b/cookbooks/minidash
diff --git a/cookbooks/mongodb b/cookbooks/mongodb
diff --git a/cookbooks/motd b/cookbooks/motd
diff --git a/cookbooks/mysql b/cookbooks/mysql
diff --git a/cookbooks/nfs b/cookbooks/nfs
diff --git a/cookbooks/nginx b/cookbooks/nginx
diff --git a/cookbooks/nodejs b/cookbooks/nodejs
diff --git a/cookbooks/ntp b/cookbooks/ntp
diff --git a/cookbooks/openssh b/cookbooks/openssh
diff --git a/cookbooks/openssl b/cookbooks/openssl
diff --git a/cookbooks/package_set b/cookbooks/package_set
diff --git a/cookbooks/papertrail b/cookbooks/papertrail
diff --git a/cookbooks/pig b/cookbooks/pig
diff --git a/cookbooks/postgresql b/cookbooks/postgresql
diff --git a/cookbooks/python b/cookbooks/python
diff --git a/cookbooks/rabbitmq b/cookbooks/rabbitmq
diff --git a/cookbooks/redis b/cookbooks/redis
diff --git a/cookbooks/resque b/cookbooks/resque
diff --git a/cookbooks/route53 b/cookbooks/route53