rig 0.4.4 → 0.4.5

data/conf/accounts/default.yml

@@ -1,47 +1,73 @@
 # The region for this account.
 # Each account can have a different region, so you can
 # manage deployments in different regions easily.
-region: us-east-1
+:region: us-east-1
 
 # The DNS zone to manage.
 # Generally this will be different for each account,
 # but it is possible to have all of your accounts
 # managed under a single zone... IF you are using
 # the same DNS provider for all of your accounts.
-dns_zone: blah.com
+:dns_zone: blah.com
 
 # this is the key that you will use to SSH to the server
-keypair: keyname
+:keypair: keyname
 
 # security groups to use when creating instances
 # groups configuration precedence:
 #   template instances -> template -> account -> config
-# groups:
+# :groups:
 #   - default
 
+# Userdata package to use
+#
+# Userdata packages allow you to further customize the way
+# the servers are configured.
+#
+# You can find these packages in your rig directory (~/.rig by default)
+#   ~/.rig/userdata/default
+#
+# The following are provided:
+#   "default" is a vanilla install
+#   "chef" is designed to bootstrap a chef implementation
+#
+# See the corresponding userdata.yml for more information
+:userdata: default
+
 # Common settings.
 # In most cases, you will be using the same provider
 # for all of the different components within your
 # infrastructure (Compute, DNS, Balancers, etc).
 # You can store the common keys and secrets here.
-common: &common
-  aws_access_key_id: aws_key
-  aws_secret_access_key: aws_secret
+:common: &common
+  :aws_access_key_id: aws_key
+  :aws_secret_access_key: aws_secret
 
 # Compute settings
 # These are passed to Fog when creating a connection
-compute:
+:compute:
   <<: *common
-  provider: AWS
-  region: *region
+  :provider: AWS
+  :region: *region
 
 # DNS settings
 # These are passed to Fog when creating a connection
-dns:
+:dns:
   <<: *common
-  provider: AWS
+  :provider: AWS
 
 # Balancer settings
 # These are passed to Fog when creating a connection
-balancer:
+:balancer:
   <<: *common
+
+# Database settings
+# MongoDB and MySQL are supported
+#:database:
+#  :provider: MongoDB # or MySQL
+#  :host: localhost
+#  :port: 27017
+#  :user: username
+#  :pass: password
+#  :admin_user: admin_username
+#  :admin_pass: admin_password

data/conf/userdata/chef/userdata.sh.erb

@@ -0,0 +1,63 @@
+#!/bin/bash
+set -e -x
+exec > ~/userdata.log 2>&1
+export DEBIAN_FRONTEND=noninteractive
+apt-add-repository -y ppa:brightbox/ruby-ng-experimental
+
+apt-get update
+apt-get -y install <%= @dependencies.join(' ') %>
+mkdir -p /var/log/chef
+mkdir -p /var/backups/chef
+mkdir -p /var/run/chef
+mkdir -p /var/cache/chef
+mkdir -p /var/lib/chef
+mkdir /etc/chef
+
+# set up hostname
+hostname <%= @name %>.<%= @zone %>
+echo "<%= @name %>.<%= @zone %>" > /etc/hostname
+echo "127.0.0.1 <%= @name %>.<%= @zone %> <%= @name.split('.')[0] %> <%= @name %> # entered by userdata script" >> /etc/hosts
+
+gem install rubygems-update --no-ri --no-rdoc
+update_rubygems
+
+<% @gems.each do |gem| %>
+gem install <%= gem %> --no-ri --no-rdoc
+<% end %>
+
+cat <<FACTS > /etc/facts.yml
+rig_name: <%= @name %>
+rig_role: <%= @role %>
+rig_environment: <%= @environment %>
+FACTS
+
+cat <<JSON > /etc/chef/bootstrap.json
+{
+    "run_list": [
+        "role[<%= @role %>]"
+    ]
+}
+JSON
+
+cat <<CLIENT > /etc/chef/client.rb
+log_level               :info
+log_location            "/var/log/chef/client.log"
+ssl_verify_mode         :verify_none
+validation_client_name  "chef-validator"
+validation_key          "/etc/chef/validation.pem"
+client_key              "/etc/chef/client.pem"
+chef_server_url         "http://chef.inqlabs.com:4000";
+file_cache_path         "/var/cache/chef"
+file_backup_path        "/var/backups/chef"
+pid_file                "/var/run/chef/client.pid"
+node_name               "<%= @name %>";
+Chef::Log::Formatter.show_time = true
+CLIENT
+
+<% @files.each do |file|; local = file["local"]; remote = file["remote"] %>
+cat << <%= local.upcase %> > <%= remote %>
+<%= File.open("#@directory/#{local}").read %>
+<%= local.upcase %>
+<% end %>
+
+chef-client -N <%= @name %> <%= @chef && @environment ? "-E " + @environment : "" %> --once -j /etc/chef/bootstrap.json 2>&1

data/conf/userdata/chef/userdata.yml

@@ -0,0 +1,19 @@
+erb: userdata.sh.erb
+files:
+  - local: validation.pem
+    remote: /etc/chef/validation.pem
+dependencies:
+  - build-essential
+  - wget
+  - curl
+  - ssl-cert
+  - ruby1.9.3
+  - ruby1.9.1-dev
+  - rubygems
+  - ruby-switch
+  - libopenssl-ruby1.9.1
+  - rdoc1.9.1
+  - ri1.9.1
+  - irb1.9.1
+gems:
+  - chef

data/conf/userdata/chef/validation.pem

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpgIBAAKCAQEAxFST0blraLl7mac91QzSxNNZQt7A4Mo4O297e+r6F5b1+Eae
+RNAH9w4p9sctLttIT8rI77hWrgS04f6mbamSaY+pAyWje+MX2s5YXizEML1Fdyr6
+hV1n/vIMOmhcVwGbF3fg6BKwjur7A1dS+aOM1sEYi77hfbY4NHhLCQiR4v2m4saC
+C9SPX7uNIzKvGB2P/5U+HNPaJuo6GAUsrOrTA/YB53Bza4DPMpyp9+Hf/ZR9l6Hd
+4tCAp07dUNZ/LKKL4AmsnCqlT5EiYFIsaq2ezzPnS9t2FlFV60a2opbdEvq/QLbz
+ouH6H+/4n/+BY9bVBCg1oBXHlLwbZmNl7Xl4wQIDAQABAoIBAQCFDIAkZ5C3psNx
+bJoFkKwhQM1D+OsjK0eSV8mKP8J+TAqi11CYd5Z+QbYEjBQ9pdNKZ7VmZzkusvfW
+E5m7xWf4a6fw/wfchBh9assN/y5xjULPMGwYByXb6zKIPoMdX3Q4IkBjZY8LO4ki
+SYJstP5T5wX4ZkIvzFYokMDg/VLITUZPnxu+OunFF/vfl7mFOIrHtCj6LSpCk5xW
+NsQqJWzK6/xjKH8KweWkl+E7k/ILUetXuCjKhj2XjiYUbzRH12e5jJIsEXRKWw8I
+Iw5I8N4fWaXbTmoI+NUV+24BqwOfCH0RjoZXcc6LOxmxKDd8a00H3bCYj9GbpLed
+oFcCY2OFAoGBAPSj4u2sSI1uMWNMivTbEYC5pYeltJgRYByazFHj5mHtPF7aDs2a
+IWBfaaHbRIk7d9mIGYOrEiFFpDi5zWYo1gEbwqqOVw4cxL6coVA5mUMdZFDSGcpL
+jwCIp9Yz92mOvygJEQosBIaMaBNTVY2GJPEo8Uhp0OstMDxIR9YrxdwjAoGBAM1y
+atxCx8Z7Mua33x6gPxyyQVnqU/Hvpa9uTF0laAcwarsNlXczyfw/5TNJsEyTzbE1
+6yJdm5GDS7L6whprx20SCHgpfBcAK6UGMMYsRvRz8kThLI7jgsXQjNXO8MNvaYwO
+z9uVp+i1OVN0jURPwu6NsHcduSCP4asZwBIIOoPLAoGBAJdZQM5rlKMy9gkJ1Lnx
+Qd3SfK7z/EtMDJsFxbwv81rIK14/J4NZhKabwL0q6za/fMEuqyJDVr8Q161kfcdj
+IiqjYwajcwY/FBUcz8vTJpdX+rTplp0Jq9nXsYYatkkuz+JT4Z/aZZ5cBRNXrgkV
+YYt1GfkDxgWI+luBGDhO8mTjAoGBAJ5j3dreaWKuTLnvfEcCSGX5T8TgkcNufRBZ
+Oup9EkyomUCI4ni6JrkhEbWO1CrVsLk01ojyHiP7U3szND5mZaPDSWBKq26YJQ3f
+Te8a58FDOr670zx+Tq3vcQTNvHUQChF+weWK5Z7VSNL8goTt8V01Q50x/y4Jf3QI
+MDo2udYtAoGBAKk596lHuH5/LEjT5hfVrbarSvUjlXswJusZGnwbtEUERY7abUbG
+5mtI+Xme2q6T0Wjf6N977ecNYAi5VwpUzoziZUPeSCQUlRWSyX2o6+fVBngOFpLZ
+tRv2ngXlc2sYh9RbnlWSdaK0g+U7V8l2wSsQjcPQ1J2vbIGjwBHDSzjc
+-----END RSA PRIVATE KEY-----

data/conf/userdata/default/userdata.sh.erb

@@ -0,0 +1,32 @@
+#!/bin/bash
+set -e -x
+exec > ~/userdata.log 2>&1
+export DEBIAN_FRONTEND=noninteractive
+apt-add-repository -y ppa:brightbox/ruby-ng-experimental
+
+apt-get update
+apt-get -y install <%= @dependencies.join(' ') %>
+
+# set up hostname
+hostname <%= @name %>.<%= @zone %>
+echo "<%= @name %>.<%= @zone %>" > /etc/hostname
+echo "127.0.0.1 <%= @name %>.<%= @zone %> <%= @name.split('.')[0] %> <%= @name %> # entered by userdata script" >> /etc/hosts
+
+gem install rubygems-update --no-ri --no-rdoc
+update_rubygems
+
+<% @gems.each do |gem| %>
+gem install <%= gem %> --no-ri --no-rdoc
+<% end %>
+
+cat <<FACTS > /etc/facts.yml
+rig_name: <%= @name %>
+rig_role: <%= @role %>
+rig_environment: <%= @environment %>
+FACTS
+
+<% @files.each do |file|; local = file["local"]; remote = file["remote"] %>
+cat << <%= local.upcase %> > <%= remote %>
+<%= File.open("#@directory/#{local}").read %>
+<%= local.upcase %>
+<% end %>

data/conf/userdata/default/userdata.yml

@@ -0,0 +1,14 @@
+erb: userdata.sh.erb
+dependencies:
+  - build-essential
+  - wget
+  - curl
+  - ssl-cert
+  - ruby1.9.3
+  - ruby1.9.1-dev
+  - rubygems
+  - ruby-switch
+  - libopenssl-ruby1.9.1
+  - rdoc1.9.1
+  - ri1.9.1
+  - irb1.9.1

data/lib/rig/command/abstract.rb

@@ -34,6 +34,7 @@ module Rig
           if detailed
             r << server.private_ip_address.to_s
           end
+          r << server.availability_zone
           r << server.flavor_id.to_s
           r << server.id.to_s
           r << server.state.to_s.downcase
@@ -50,6 +51,7 @@ module Rig
         cols << "Protected"
         cols << "Public IP"
         cols << "Private IP" if detailed
+        cols << "AZ"
         cols << "Size"
         cols << "Instance ID"
         cols << "State"

data/lib/rig/command/balancer/list.rb

@@ -16,6 +16,10 @@ module Rig
             lb.instances.each do |inst|
               puts "  - #{inst}"
             end
+            puts "- zones"
+            lb.availability_zones.each do |z|
+              puts "  - #{z}"
+            end
           end
         end
       end

data/lib/rig/command/environment/list.rb

@@ -17,9 +17,10 @@ module Rig
             rows = []
             envs.each do |e|
               env = Rig::Model::Environment.find(e)
-              rows << [env.name, env.template, env.region, env.servers.count, env.balancers.count, env.protected?]
+              zones = env.servers.collect {|e| e.availability_zone }
+              rows << [env.name, env.template, env.region, env.servers.count, env.balancers.count, env.protected?, zones]
             end
-            print_table(%w{Name Template Region Servers# Balancers# Protected?}, rows)
+            print_table(%w{Name Template Region Servers# Balancers# Protected? AZs}, rows)
           end
         end
       end

data/lib/rig/command/main.rb

@@ -25,6 +25,17 @@ module Rig
         File.open(dest, "w") {|f| f.write(new.to_yaml)}
       end
 
+      subcommand "userdata", "test userdata" do
+        parameter "NAME", "name of server"
+        parameter "ROLE", "role of server"
+        parameter "ENVIRONMENT", "environment of server"
+
+        def execute
+          userdata = Rig::Model::Userdata.create(name, role, environment)
+          puts "USERDATA:\n#{userdata}"
+        end
+      end
+
       subcommand "init", "initialize configuration directory" do
         option %w{-f --force}, :flag, "force creation of files", :default => false
         option %w{-d --directory}, "DIRECTORY", "configuration directory", :default => "~/.rig"
@@ -34,7 +45,17 @@ module Rig
           back = "#{dir}.bak.#{Time.now.to_i}"
           conf = File.expand_path("../../../../conf", __FILE__)
 
-          files = ["config.yml", "accounts/default.yml", "templates/solo.yml", "templates/multi.yml"]
+          files = %w{
+            config.yml
+            accounts/default.yml
+            templates/solo.yml
+            templates/multi.yml
+            userdata/default/userdata.sh.erb
+            userdata/default/userdata.yml
+            userdata/chef/userdata.sh.erb
+            userdata/chef/userdata.yml
+            userdata/chef/validation.pem
+          }
 
           unless dir
             puts "directory could not be found: tried environment variables RIG_CONFIG (#{ENV['RIG_CONFIG']}) and HOME (#{ENV['HOME']}"
@@ -50,12 +71,11 @@ module Rig
 
           puts "[create] #{dir}/"
           FileUtils.mkdir_p(dir)
-          FileUtils.mkdir_p("#{dir}/accounts")
-          FileUtils.mkdir_p("#{dir}/templates")
 
           files.each do |file|
             src  = "#{conf}/#{file}"
             dest = "#{dir}/#{file}"
+            FileUtils.mkdir_p(File.dirname(dest))
             if File.exists?(dest) && !force?
               puts "[skip] #{dest}"
             else

data/lib/rig/model/balancer.rb

@@ -8,18 +8,19 @@ module Rig
           Rig::Connection.balancer.load_balancers.all
         end
 
-        def new(name, listeners=[])
+        def new(name, listeners=[], zones=[])
+          fog = Rig::Connection.balancer
           listeners.map! do |listener|
             ld = new_listener_description(listener)
             #ap ld
             ld
           end
           #ap listeners
-          Rig::Connection.balancer.load_balancers.new({ :id => name, "ListenerDescriptions" => listeners })
+          fog.load_balancers.new({ :id => name, "ListenerDescriptions" => listeners, :availability_zones => zones })
         end
 
-        def create(name, listeners=[])
-          b = self.new(name, listeners)
+        def create(name, listeners=[], zones=[])
+          b = self.new(name, listeners, zones)
           b.save if b
           puts ".. created: #{name}"
           b

data/lib/rig/model/environment.rb

@@ -90,7 +90,8 @@ module Rig
 
             if tmpl[:balance]
               puts "creating balancer"
-              balancer = Rig::Model::Balancer.create("#{name}-#{role}", tmpl[:listeners])
+              zones = setinstances.collect {|e| e.availability_zone }
+              balancer = Rig::Model::Balancer.create("#{name}-#{role}", tmpl[:listeners], zones)
               balancer.register_instances(setinstances.collect { |e| e.id })
               balancer.save
 

data/lib/rig/model/userdata.rb

@@ -1,111 +1,30 @@
 require 'erubis'
+require 'awesome_print'
 
 module Rig
   module Model
     class Userdata
       class << self
         def create(name, role, environment, opts={ })
-          data     = {
+          package = Rig.get_config(:userdata)
+          directory = "#{Rig.configdir}/userdata/#{package}"
+          config = YAML.load_file("#{directory}/userdata.yml")
+
+          data = {
               :name         => name,
               :role         => role,
               :environment  => environment,
               :zone         => Rig.get_config(:dns_zone),
-              :dependencies => %w{ ruby1.9.3 ruby1.9.1-dev rubygems ruby-switch libopenssl-ruby1.9.1 rdoc1.9.1 ri1.9.1 irb1.9.1
-                                 build-essential wget ssl-cert curl },
-              :gems         => %w{chef},
-              :chef         => false,
-          }.merge(opts)
-          template = <<-EOF
-#!/bin/bash
-set -e -x
-exec > ~/userdata.log 2>&1
-export DEBIAN_FRONTEND=noninteractive
-apt-add-repository -y ppa:brightbox/ruby-ng-experimental
-
-apt-get update && apt-get upgrade -y
-apt-get -y install <%= @dependencies.join(' ') %>
-mkdir -p /var/log/chef
-mkdir -p /var/backups/chef
-mkdir -p /var/run/chef
-mkdir -p /var/cache/chef
-mkdir -p /var/lib/chef
-mkdir /etc/chef
-
-# set up hostname
-hostname <%= @name %>.<%= @zone %>
-echo "<%= @name %>.<%= @zone %>" > /etc/hostname
-echo "127.0.0.1 <%= @name %>.<%= @zone %> <%= @name.split('.')[0] %> <%= @name %> # entered by userdata script" >> /etc/hosts
-
-gem install rubygems-update --no-ri --no-rdoc
-update_rubygems
-
-<% @gems.each do |gem| %>
-gem install <%= gem %> --no-ri --no-rdoc
-<% end %>
-
-cat <<FACTS > /etc/facts.yml
-inq_name: <%= @name %>
-inq_role: <%= @role %>
-inq_environment: <%= @environment %>
-FACTS
-
-cat <<JSON > /etc/chef/bootstrap.json
-{
-  "run_list": [
-    "role[<%= @role %>]"
-  ]
-}
-JSON
-
-cat <<CLIENT > /etc/chef/client.rb
-log_level               :info
-log_location            "/var/log/chef/client.log"
-ssl_verify_mode         :verify_none
-validation_client_name  "chef-validator"
-validation_key          "/etc/chef/validation.pem"
-client_key              "/etc/chef/client.pem"
-chef_server_url         "http://chef.inqlabs.com:4000";
-file_cache_path         "/var/cache/chef"
-file_backup_path        "/var/backups/chef"
-pid_file                "/var/run/chef/client.pid"
-node_name               "<%= @name %>";
-Chef::Log::Formatter.show_time = true
-CLIENT
-
-cat <<VALID > /etc/chef/validation.pem
------BEGIN RSA PRIVATE KEY-----
-MIIEpgIBAAKCAQEAxFST0blraLl7mac91QzSxNNZQt7A4Mo4O297e+r6F5b1+Eae
-RNAH9w4p9sctLttIT8rI77hWrgS04f6mbamSaY+pAyWje+MX2s5YXizEML1Fdyr6
-hV1n/vIMOmhcVwGbF3fg6BKwjur7A1dS+aOM1sEYi77hfbY4NHhLCQiR4v2m4saC
-C9SPX7uNIzKvGB2P/5U+HNPaJuo6GAUsrOrTA/YB53Bza4DPMpyp9+Hf/ZR9l6Hd
-4tCAp07dUNZ/LKKL4AmsnCqlT5EiYFIsaq2ezzPnS9t2FlFV60a2opbdEvq/QLbz
-ouH6H+/4n/+BY9bVBCg1oBXHlLwbZmNl7Xl4wQIDAQABAoIBAQCFDIAkZ5C3psNx
-bJoFkKwhQM1D+OsjK0eSV8mKP8J+TAqi11CYd5Z+QbYEjBQ9pdNKZ7VmZzkusvfW
-E5m7xWf4a6fw/wfchBh9assN/y5xjULPMGwYByXb6zKIPoMdX3Q4IkBjZY8LO4ki
-SYJstP5T5wX4ZkIvzFYokMDg/VLITUZPnxu+OunFF/vfl7mFOIrHtCj6LSpCk5xW
-NsQqJWzK6/xjKH8KweWkl+E7k/ILUetXuCjKhj2XjiYUbzRH12e5jJIsEXRKWw8I
-Iw5I8N4fWaXbTmoI+NUV+24BqwOfCH0RjoZXcc6LOxmxKDd8a00H3bCYj9GbpLed
-oFcCY2OFAoGBAPSj4u2sSI1uMWNMivTbEYC5pYeltJgRYByazFHj5mHtPF7aDs2a
-IWBfaaHbRIk7d9mIGYOrEiFFpDi5zWYo1gEbwqqOVw4cxL6coVA5mUMdZFDSGcpL
-jwCIp9Yz92mOvygJEQosBIaMaBNTVY2GJPEo8Uhp0OstMDxIR9YrxdwjAoGBAM1y
-atxCx8Z7Mua33x6gPxyyQVnqU/Hvpa9uTF0laAcwarsNlXczyfw/5TNJsEyTzbE1
-6yJdm5GDS7L6whprx20SCHgpfBcAK6UGMMYsRvRz8kThLI7jgsXQjNXO8MNvaYwO
-z9uVp+i1OVN0jURPwu6NsHcduSCP4asZwBIIOoPLAoGBAJdZQM5rlKMy9gkJ1Lnx
-Qd3SfK7z/EtMDJsFxbwv81rIK14/J4NZhKabwL0q6za/fMEuqyJDVr8Q161kfcdj
-IiqjYwajcwY/FBUcz8vTJpdX+rTplp0Jq9nXsYYatkkuz+JT4Z/aZZ5cBRNXrgkV
-YYt1GfkDxgWI+luBGDhO8mTjAoGBAJ5j3dreaWKuTLnvfEcCSGX5T8TgkcNufRBZ
-Oup9EkyomUCI4ni6JrkhEbWO1CrVsLk01ojyHiP7U3szND5mZaPDSWBKq26YJQ3f
-Te8a58FDOr670zx+Tq3vcQTNvHUQChF+weWK5Z7VSNL8goTt8V01Q50x/y4Jf3QI
-MDo2udYtAoGBAKk596lHuH5/LEjT5hfVrbarSvUjlXswJusZGnwbtEUERY7abUbG
-5mtI+Xme2q6T0Wjf6N977ecNYAi5VwpUzoziZUPeSCQUlRWSyX2o6+fVBngOFpLZ
-tRv2ngXlc2sYh9RbnlWSdaK0g+U7V8l2wSsQjcPQ1J2vbIGjwBHDSzjc
------END RSA PRIVATE KEY-----
-VALID
-
-chef-client -N <%= @name %> <%= @chef && @environment ? "-E " + @environment : "" %> --once -j /etc/chef/bootstrap.json 2>&1
-          EOF
-          erb = Erubis::Eruby.new(template)
-          out = erb.evaluate(data)
+              :dependencies => [],
+              :gems         => [],
+              :files        => [],
+              :directory    => directory,
+              :template     => "userdata.sh.erb",
+          }.merge(config).merge(opts)
+
+          template = File.open("#{directory}/#{data[:template]}").read
+          erb      = Erubis::Eruby.new(template)
+          out      = erb.evaluate(data)
         end
       end
     end

data/lib/rig/version.rb

@@ -3,7 +3,7 @@ unless defined?(Rig::Version)
     module Version
       MAJOR = 0
       MINOR = 4
-      TINY  = 4
+      TINY  = 5
       STRING = [MAJOR, MINOR, TINY].join('.')
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rig
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-18 00:00:00.000000000 Z
+date: 2012-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -126,6 +126,11 @@ files:
 - conf/config.yml
 - conf/templates/multi.yml
 - conf/templates/solo.yml
+- conf/userdata/chef/userdata.sh.erb
+- conf/userdata/chef/userdata.yml
+- conf/userdata/chef/validation.pem
+- conf/userdata/default/userdata.sh.erb
+- conf/userdata/default/userdata.yml
 - lib/rig.rb
 - lib/rig/capistrano.rb
 - lib/rig/chef.rb