gaptool 0.10.9 → 0.11.0

data/Gemfile

@@ -6,3 +6,4 @@ gem 'aws-sdk'
 gem 'json'
 gem 'peach'
 gem 'rainbow'
+gem 'crack'

data/Gemfile.lock

@@ -6,6 +6,7 @@ GEM
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
+    crack (0.3.1)
     httparty (0.8.3)
       multi_json (~> 1.0)
       multi_xml
@@ -26,6 +27,7 @@ PLATFORMS
 
 DEPENDENCIES
   aws-sdk
+  crack
   json
   net-scp
   net-ssh

data/bin/gt

@@ -4,11 +4,12 @@ require 'rubygems'
 require 'net/ssh'
 require 'trollop'
 require 'yaml'
-require 'aws'
+require 'aws-sdk'
 require 'json'
 require 'peach'
 require 'erb'
 require 'rainbow'
+require 'crack'
 require File.expand_path(File.dirname(__FILE__) + "/../lib/app.rb")
 
 # Make sure lang isn't fucked

data/gaptool.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "gaptool"
-  s.version = "0.10.9"
+  s.version = "0.11.0"
   s.authors = ['Matt Bailey']
   s.email = ['m@mdb.io']
   s.homepage = 'http://mdb.io'
@@ -16,5 +16,6 @@ Gem::Specification.new do |s|
   s.add_dependency "json"
   s.add_dependency "peach"
   s.add_dependency "rainbow"
+  s.add_dependency "crack"
 end
 

data/lib/app.rb

@@ -1,7 +1,7 @@
 def setup
   yaml = Hash.new
-  unless File.directory?("#{ENV['HOME']}/.gaptool") || File.exists?("#{ENV['HOME']}/.gaptool")
-    puts "Welcome to gaptool setup\nThis will set up your ~/.gaptool configuration\nYou will need very little info here if you are NOT creating new nodes (e.g. just configuring and deploying)\nIf you ARE using the the 'init' facility, you will need your AWS ID, Secret, and EC2 PEM keys for relevant Availability Zones.".color(:red)
+  unless File.directory?("#{ENV['HOME']}/.gaptool-ma") || File.exists?("#{ENV['HOME']}/.gaptool-ma")
+    puts "Welcome to gaptool setup\nThis will set up your ~/.gaptool-ma configuration\nYou will need very little info here if you are NOT creating new nodes (e.g. just configuring and deploying)\nIf you ARE using the the 'init' facility, you will need your AWS ID, Secret, and EC2 PEM keys for relevant Availability Zones.".color(:red)
     puts "Starting with your AWS ID/Secret.\nIf you don't have these, just press enter.".color(:cyan)
     print "Enter your AWS ID: "
     yaml['aws_id'] = gets.chomp
@@ -24,11 +24,11 @@ def setup
     data = [ key.to_blob ].pack('m0')
     yaml['mykey'] = key.to_pem
     yaml['mypub'] = "#{type} #{data}"
-    Dir.mkdir("#{ENV['HOME']}/.gaptool")
-    Dir.mkdir("#{ENV['HOME']}/.gaptool/plugins")
-    File.open("#{ENV['HOME']}/.gaptool/plugins.yml", "w") {}
-    File.open(File.expand_path("~/.gaptool/user.yml"), 'w') {|f| f.write(yaml.to_yaml) }
-    puts "Your ~/.gaptool directory and user.yml have been configured\nPlease ask your administrator to provide you with a env.yml\nAdd the following public key to your github profile (or your git repo server)\nas well as in the authorized_keys file in your chef recipe for the admin user.".color(:cyan)
+    Dir.mkdir("#{ENV['HOME']}/.gaptool-ma")
+    Dir.mkdir("#{ENV['HOME']}/.gaptool-ma/plugins")
+    File.open("#{ENV['HOME']}/.gaptool-ma/plugins.yml", "w") {}
+    File.open(File.expand_path("~/.gaptool-ma/user.yml"), 'w') {|f| f.write(yaml.to_yaml) }
+    puts "Your ~/.gaptool-ma directory and user.yml have been configured\nPlease ask your administrator to provide you with a env.yml\nAdd the following public key to your github profile (or your git repo server)\nas well as in the authorized_keys file in your chef recipe for the admin user.".color(:cyan)
     puts yaml['mypub']
     exit 0
   end
@@ -36,18 +36,19 @@ end
 setup()
 
 $dist_plugins = [ 'Base' ]
-if YAML::load(File.open("#{ENV['HOME']}/.gaptool/plugins.yml"))
-  $plugins = $dist_plugins + YAML::load(File.open("#{ENV['HOME']}/.gaptool/plugins.yml"))
+if YAML::load(File.open("#{ENV['HOME']}/.gaptool-ma/plugins.yml"))
+  $plugins = $dist_plugins + YAML::load(File.open("#{ENV['HOME']}/.gaptool-ma/plugins.yml"))
 else
   $plugins = $dist_plugins
 end
 
 $commands = Hash.new
+$c = Array.new
 $plugins.each do |plugin|
   if $dist_plugins.include? plugin
     $commands.merge!(YAML::load(File.open(File.expand_path(File.dirname(__FILE__) + "/plugins/#{plugin}/config.yml"))))
   else
-    $commands.merge!(YAML::load(File.open("#{ENV['HOME']}/.gaptool/plugins/#{plugin.to_s}/config.yml")))
+    $commands.merge!(YAML::load(File.open("#{ENV['HOME']}/.gaptool-ma/plugins/#{plugin.to_s}/config.yml")))
   end
 end
 
@@ -69,24 +70,18 @@ else
     end
   end
 end
-
 class GTBase
   def isCluster?
-    if @env_settings['applications'][@args[:app]][@args[:environment]]['cluster']
-      return true
-    else
-      return false
-    end
+    return false
   end
   def getCluster
     hosts = Array.new
-    if isCluster?
-      @env_settings['applications'][@args[:app]][@args[:environment]]['cluster'].each do |node|
-        hosts << "#{@args[:app]}-#{@args[:environment]}-#{node}.#{@env_settings['domain']}"
-      end
-    else
-      hosts << "#{@args[:app]}-#{@args[:environment]}.#{@env_settings['domain']}"
+    if @args[:role]
+      nodes = $c.select {|f| f[:role] == @args[:role] }.select {|i| i[:environment] == @args[:environment]}
+    elsif @args[:app]
+      nodes = $c.select {|i| i[:environment] == @args[:environment]}.select {|f| f[:apps].include? @args[:app]}
     end
+    nodes.each {|f| hosts += [f[:hostname]]}
     return hosts
   end
   def sshcmd(host, commands, options = {})
@@ -101,6 +96,7 @@ class GTBase
       key = @user_settings['mykey']
     end
     Net::SSH.start(host, user, :key_data => [key], :config => false, :keys_only => true, :paranoid => false) do |ssh|
+      ENV['SSH_AUTH_SOCK'] = ''
       commands.each do |command|
         if !options[:quiet]
           puts command.color(:cyan)
@@ -149,35 +145,79 @@ class GTBase
     return true
   end
   def singleHost
-    if @args[:node] == 'solo' && isCluster?
-      puts "The environment you're accessing is a cluster.\nYou've selected an action that acts only on a single node, but have not specified a node with --node/-n\nAborting."
-      exit 100
-    end
-    if isCluster?
-      return "#{@args[:app]}-#{@args[:environment]}-#{@args[:node]}.#{@env_settings['domain']}"
-    else
-      return "#{@args[:app]}-#{@args[:environment]}.#{@env_settings['domain']}"
-    end
+    return "#{@args[:role]}-#{@args[:environment]}-#{@args[:number]}.#{@env_settings['domain']}"
   end
   def initialize(args)
     @args = args
     if ENV['GT_ENV_SETTINGS']
         @env_settings = YAML::load(File.open(File.expand_path(ENV['GT_ENV_CONFIG'])))
     else
-        @env_settings = YAML::load(File.open(File.expand_path("#{ENV['HOME']}/.gaptool/env.yml")))
+        @env_settings = YAML::load(File.open(File.expand_path("#{ENV['HOME']}/.gaptool-ma/env.yml")))
     end
     if ENV['GT_USER_SETTINGS']
         @user_settings = YAML::load(File.open(File.expand_path(ENV['GT_USER_CONFIG'])))
     else
-        @user_settings = YAML::load(File.open(File.expand_path("#{ENV['HOME']}/.gaptool/user.yml")))
+        @user_settings = YAML::load(File.open(File.expand_path("#{ENV['HOME']}/.gaptool-ma/user.yml")))
     end
     chef_extra = {
       'rails_env' => @args[:environment],
-      'server_names' => getCluster()
     }
-    @chefsettings = @env_settings['applications'][@args[:app]][@args[:environment]]
-    @chefsettings.merge!(@args)
+    @chefsettings = @args
     @chefsettings.merge!(chef_extra)
+    if @args[:zone].to_s == ''
+      zone = @env_settings['default_zone']
+    else
+      zone = @args[:zone]
+    end
+    az = zone.chop
+    AWS.config(:access_key_id => @user_settings['aws_id'], :secret_access_key => @user_settings['aws_secret'], :ec2_endpoint => "ec2.#{az}.amazonaws.com")
+    @ec2 = AWS::EC2.new
+    def cgen
+      c = Array.new
+      tags = @ec2.instances.inject({}) { |m, i| m[i.id] = i.tags.to_h; m }
+      tags.keys.each do |key|
+        if tags[key]['gaptool'] != nil
+          gaptags = eval(tags[key]['gaptool'])
+          hostname = "#{gaptags[:role]}-#{gaptags[:environment]}-#{gaptags[:number]}.#{@env_settings['domain']}"
+          c += [{
+            :hostname => hostname,
+            :recipe => gaptags[:recipe],
+            :deploy => gaptags[:deploy],
+            :number => gaptags[:number],
+            :role => gaptags[:role],
+            :environment => gaptags[:environment],
+            :apps => eval(gaptags[:apps])
+          }]
+        end
+      end
+      return c
+    end
+    if File.exists?("#{ENV['HOME']}/.gaptool-ma/aws.yml")
+      $c = YAML::load(File.open(File.expand_path("#{ENV['HOME']}/.gaptool-ma/aws.yml")))
+    else
+      $c = cgen()
+    end
+    cwrite = fork do
+      File.open(File.expand_path("#{ENV['HOME']}/.gaptool-ma/aws.yml"), 'w') {|f| f.write(cgen().to_yaml)}
+    end
+    Process.detach(cwrite)
+  end
+  def recipeRun(host, run_list, settings={})
+    host_settings = {
+      'this_server' => host,
+      'run_list'    => [ "recipe[#{run_list}]" ],
+      'app_user'    => @env_settings['user'],
+    }
+    @chefsettings.merge!(host_settings)
+    @chefsettings.merge!(settings)
+    @chefsettings.merge!($c.select {|f| f[:hostname] == host}.first)
+    run = [
+      "cd ~admin/ops; git pull",
+      "echo '#{@chefsettings.to_json}' > ~admin/solo.json",
+      "sudo chef-solo -c ~admin/ops/cookbooks/solo.rb -j ~admin/solo.json"
+    ]
+    putkey(host)
+    sshcmd(host, run)
   end
 end
 
@@ -186,13 +226,11 @@ class GTCluster < GTBase
     if $dist_plugins.include?(plugin)
       require File.expand_path(File.dirname(__FILE__) + "/plugins/#{plugin}/plugin.rb")
     else
-      require File.expand_path(ENV['HOME'] + "/.gaptool/plugins/#{plugin}/plugin.rb")
+      require File.expand_path(ENV['HOME'] + "/.gaptool-ma/plugins/#{plugin}/plugin.rb")
     end
     include Object.const_get(plugin)
   end
 end
 
-
-
 cluster = GTCluster.new(cmd_opts)
 cluster.send cmd

data/lib/plugins/Base/config.yml

@@ -7,14 +7,34 @@ default: &withoutnode
   environment:
     short: -e
     type: string
-    help: Environment, e.g. staging
+    help: environment, e.g. staging
     default: nil
 chefrun:
-  << : *withoutnode
-  recipe:
+  role:
     short: -r
-    help: specific recipe
+    type: string
+    help: server role, e.g. app
+    default: nil
+  environment:
+    short: -e
+    type: string
+    help: environment, e.g. staging
+    default: nil
+  recipe:
+    short: -c
+    help: specific recipe, default is main
+    default: main
+add:
+  template:
+    short: -t
+    type: string
+    help: template file for adding server
     default: nil
+  zone:
+    short: -z
+    type: string
+    help: availability zone to start the new server in, default is us-east-1d
+    default: us-east-1d
 scpto: &node
   << : *withoutnode
   node:
@@ -25,14 +45,28 @@ scpto: &node
 scpfrom:
   << : *node
 ssh:
-  << : *node
+  role:
+    short: -r
+    type: string
+    help: server role, e.g. app
+    default: nil
+  environment:
+    short: -e
+    type: string
+    help: environment, e.g. staging
+    default: nil
+  number:
+    short: -n
+    type: string
+    help: node number, e.g. 1
+    default: nil
 deploy:
   << : *withoutnode
   migrate:
     short: -m
     help: "Toggle migrations, default off"
     defaut: nil
-  branch: 
+  branch:
     short: -r
     help: "Choose git branch, default defined in your gt_env.yml"
     type: string
@@ -43,24 +77,12 @@ rollback:
     short: -m
     help: "Toggle migrations, default off"
     defaut: nil
-  branch: 
+  branch:
     short: -r
     help: "Choose git branch, default defined in your gt_env.yml"
     type: string
     default: nil
-init:
-  << : *node
-  zone:
-    short: -z
-    help: "availability zone to deploy in, default in your gt_env.yml"
-    type: string
-    default: nil
-  arch:
-    short: -r
-    help: "CPU architecture, currently i686 or x86_64"
-    type: string
-    default: nil
-web:
+toggle:
   << : *withoutnode
   enable:
     short: -n
@@ -79,4 +101,3 @@ log:
     help: "Log type, as defined in the plugin's log.yml"
     type: string
     default: nil
-

data/lib/plugins/Base/plugin.rb

@@ -29,26 +29,10 @@ module Base
   end
   def chefrun
     if sshReachable?
+      run_list = $c.detect{|f| f[:role] == @args[:role] }[:recipe] || @args[:recipe]
       hosts = getCluster()
-      run_list = @chefsettings['normal_recipe']
-      unless eval(@args[:recipe]).nil?
-        run_list = @args[:recipe]
-      end
       hosts.peach do |host|
-        host_settings = {
-          'this_server' => host,
-          'run_list'    => [ "recipe[#{run_list}]" ],
-          'app_user'    => @env_settings['user'],
-          'app_name'    => @args[:app]
-        }
-        json = @chefsettings.merge!(host_settings).to_json
-        run = [
-          "cd ~admin/ops; git pull",
-          "echo '#{json}' > ~admin/solo.json",
-          "sudo chef-solo -c ~admin/ops/cookbooks/solo.rb -j ~admin/solo.json"
-        ]
-        putkey(host)
-        sshcmd(host, run)
+        recipeRun(host, run_list)
       end
     end
   end
@@ -72,156 +56,114 @@ module Base
   end
   def deploy
     if sshReachable?
-      if @args[:branch] == "nil" || @args[:branch].nil?
-        branch = @env_settings['applications'][@args[:app]][@args[:environment]]['default_branch']
-      else
-        branch = @args[:branch]
-      end
       hosts = getCluster()
       hosts.peach do |host|
-        host_settings = {
-          'this_server' => host,
-          'run_list'    => [ "recipe[#{@chefsettings['deploy_recipe']}]" ],
-          'do_migrate'  => @args[:migrate],
-          'branch'      => branch,
-          'app_user'    => @env_settings['user'],
-          'app_name'    => @args[:app],
-          'rollback'    => false
+        begin
+          run_list = $apps[@args[:app]][:deploy]
+        rescue
+          run_list = 'deploy'
+        end
+        unless @args[:branch].to_s == 'nil'
+          @branch = @args[:branch]
+        end
+        @deploy_settings = {
+          'branch' => @branch,
+          'app_name' => @args[:app],
+          'rollback' => false
         }
-        json = @chefsettings.merge!(host_settings).to_json
-        run = [
-          "cd ~admin/ops; git pull",
-          "echo '#{json}' > ~admin/solo.json",
-          "sudo chef-solo -c ~admin/ops/cookbooks/solo.rb -j ~admin/solo.json"
-        ]
-        putkey(host)
-        sshcmd(host, run)
+        recipeRun(host, run_list, @deploy_settings)
       end
     end
   end
   def rollback
     if sshReachable?
-      if @args[:branch] == "nil" || @args[:branch].nil?
-        branch = @env_settings['applications'][@args[:app]][@args[:environment]]['default_branch']
-      else
-        branch = @args[:branch]
-      end
       hosts = getCluster()
       hosts.peach do |host|
-        host_settings = {
-          'this_server' => host,
-          'run_list'    => [ "recipe[#{@chefsettings['deploy_recipe']}]" ],
-          'do_migrate'  => @args[:migrate],
-          'branch'      => branch,
-          'app_user'    => @env_settings['user'],
-          'app_name'    => @args[:app],
-          'rollback'    => true
+        run_list = $c.detect{|f| f[:hostname] == host }[:deploy]
+        @deploy_settings = {
+          'app_name' => @args[:app],
+          'rollback' => true
         }
-        json = @chefsettings.merge!(host_settings).to_json
-        run = [
-          "cd ~admin/ops; git pull",
-          "echo '#{json}' > ~admin/solo.json",
-          "sudo chef-solo -c ~admin/ops/cookbooks/solo.rb -j ~admin/solo.json"
-        ]
-        putkey(host)
-        sshcmd(host, run)
+        recipeRun(host, run_list, @deploy_settings)
       end
     end
   end
-  def web
+  def toggle
     if sshRachable?
       hosts = getCluster()
       if @args[:enable]
-        hosts.peach do |host|
-          sshcmd(host, "sudo -u #{@env_settings['user']} rm /data/#{@args[:app]}/shared/system/maintenance.html 2> /dev/null", :quiet => true)
-          puts "#{host} : web enabled"
-        end
+        @settings = { 'toggle' => 'enable' }
       end
       if @args[:disable]
-        hosts.peach do |host|
-          sshcmd(host, "sudo -u #{@env_settings['user']} ln -sf /data/#{@args[:app]}/current/public/maintenance.html /data/#{@args[:app]}/shared/system/maintenance.html", :quiet => true)
-          puts "#{host} : web disabled"
-        end
+        @settings = { 'toggle' => 'disable' }
+      end
+       hosts.peach do |host|
+        recipeRun(host, 'toggle', @deploy_settings)
       end
     end
   end
-  def init
-    if @args[:zone] == 'nil'
-      zone = @env_settings['default_zone']
-    else
-      zone = @args[:zone]
-    end
-    az = zone.chop
-    if @args[:arch] == 'nil'
-      arch = @env_settings['default_arch']
-    else
-      arch = @args[:arch]
-    end
-    ami = @env_settings['amis'][az][arch]['id']
-    user = @env_settings['amis'][az][arch]['user']
-    if @args[:node] == 'solo' && isCluster?
-      hosts = getCluster()
-    end
-    if @args[:node] != 'solo' || !isCluster?
-      hosts = [ singleHost() ]
-    end
+  def add
+    $c = cgen()
     begin
-      initscript = File.read(File.expand_path(File.dirname(__FILE__) + "/init/#{@env_settings['amis'][az][arch]['os']}.erb"))
+      @initfile = YAML::load(File.open(@args[:template]))
     rescue
-      puts "There is no init file for your OS, aborting."
-      exit 100
+      puts "Please input a valid yaml file for the template"
     end
-    itype = @env_settings['applications'][@args[:app]][@args[:environment]]['itype']
-    keyname = @user_settings['awskeys'][az]
-    key = @user_settings['initkeys'][keyname]
-    sg = @env_settings['applications'][@args[:app]][@args[:environment]]['sg']
-    AWS.config(:access_key_id => @user_settings['aws_id'], :secret_access_key => @user_settings['aws_secret'], :ec2_endpoint => "ec2.#{az}.amazonaws.com")
-    ec2 = AWS::EC2.new
-    hosts.peach do |host|
-      host_settings = {
-        'this_server' => host,
-        'run_list'    => [ "recipe[#{@chefsettings['init_recipe']}]" ],
-        'do_migrate'  => @args[:migrate],
-        'branch'      => @args[:branch],
-        'app_user'    => @env_settings['user'],
-        'app_name'    => @args[:app]
-      }
-      json = @chefsettings.merge!(host_settings).to_json
-      instance = ec2.instances.create(:image_id => ami, :availability_zone => zone, :instance_type => itype, :key_name => keyname, :security_group_ids => sg)
-      print "Waiting for instanace to start".color(:cyan)
-      while instance.status != :running do
-        sleep 5
-        print ".".color(:yellow)
-      end
-      puts ""
-      print "Waiting for SSH to respoond".color(:cyan)
-      loop do
-        begin
-          ip = instance.ip_address
-          sshcmd(ip, ["exit 0"], :user => user, :key => key)
-          break
-        rescue
-          print ".".color(:yellow)
+    if @initfile['number'].to_i == 0
+      numbers = [0]
+      $c.each do |host|
+        if host[:role] == @initfile['role'] && host[:environment] == @initfile['environment']
+          numbers << host[:number]
         end
-        sleep 2
       end
-      puts "Sleeping another 5s for disks to settle".color(:cyan)
-      sleep 5
-      ip = instance.ip_address
-      puts ""
-      instance.add_tag('dns', :value => host)
-      instance.add_tag('app', :value => @args[:app])
-      instance.add_tag('environment', :value => @args[:environment])
-      instance.add_tag('Name', :value => host.sub(".#{@env_settings['domain']}", ""))
-      instance.add_tag('node', :value => @args[:node])
-      render = ERB.new(initscript)
-      run = render.result(binding).split(/\n/)
-      run += [
-          "echo '#{json}' > /tmp/solo.json",
-          "sudo su -c 'chef-solo -c ~admin/ops/cookbooks/solo.rb -j /tmp/solo.json'",
-          "sudo rm /tmp/solo.json"
-        ]
-      sshcmd(ip, run, :user => user, :key => key)
+      number = numbers.max+1
+    else
+      number = @initfile['role'].to_i
+    end
+    AWS.config(:access_key_id => @user_settings['aws_id'], :secret_access_key => @user_settings['aws_secret'], :ec2_endpoint => "ec2.amazonaws.com")
+    ec2 = AWS::EC2.new
+    init = {
+      :number => number,
+      :hostname => "#{@initfile['role']}-#{@initfile['environment']}-#{number}.#{@initfile['domain']}",
+      :recipe => 'init',
+      :run_list => ["recipe[init]"]
+    }
+    @initfile.keys.each do |key|
+      @initfile[(key.to_sym rescue key) || key] = @initfile.delete(key)
+    end
+    init.merge! @initfile
+    @json = init.to_json
+    script = <<INITSCRIPT
+#!/usr/bin/env bash
+apt-get install -y zsh git libssl-dev ruby1.9.1-full build-essential
+REALLY_GEM_UPDATE_SYSTEM=true gem update --system
+gem install --bindir /usr/local/bin --no-ri --no-rdoc chef
+cat << 'EOFKEY' > /root/.ssh/id_rsa
+#{init[:identity]}
+EOFKEY
+chmod 600 /root/.ssh/id_rsa
+echo 'StrictHostKeyChecking no' > /root/.ssh/config
+git clone -b #{init[:chefbranch]} #{init[:chefrepo]} /root/ops
+echo '#{@json}' > /root/init.json
+while [ ! -b '/dev/xvdf' ]; do sleep 1; done
+while [ ! -b '/dev/xvdg' ]; do sleep 1; done
+chef-solo -c /root/ops/cookbooks/init.rb -j /root/init.json && (r53_update.sh; rm /root/.ssh/id_rsa; userdel -r ubuntu)
+INITSCRIPT
+    instance = ec2.instances.create(:image_id => init[:ami], :availability_zone => @args[:zone], :instance_type => init[:itype], :key_name => init[:keyname], :security_group_ids => init[:sg], :user_data => script)
+    sleep 1 until instance.status == :running
+    volume = ec2.volumes.create(:size => init[:datasize], :availability_zone => @args[:zone])
+    attachment = volume.attach_to(instance, "/dev/sdf")
+    vol2id = 'nil'
+    if init[:environment] == 'production'
+      volume2 = ec2.volumes.create(:size => init[:datasize], :availability_zone => @args[:zone])
+      attachment2 = volume2.attach_to(instance, "/dev/sdg")
+      sleep 1 until attachment2.status != :attaching
+      vol2id = volume2.id
     end
+    instance.add_tag('Name' , :value => "#{init[:role]}-#{init[:environment]}-#{number}")
+    instance.add_tag('dns', :value => "#{init[:role]}-#{init[:environment]}-#{number}.#{init[:domain]}")
+    instance.add_tag('gaptool', :value => "{:role => '#{init[:role]}', :number => #{number}, :environment => '#{init[:environment]}', :apps => '#{init[:apps].to_s}', :volid => '#{volume.id}', :vol2id => '#{vol2id}'}")
+    sleep 2
+    File.open(File.expand_path("#{ENV['HOME']}/.gaptool-ma/aws.yml"), 'w') {|f| f.write(cgen().to_yaml)}
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaptool
 version: !ruby/object:Gem::Version
-  version: 0.10.9
+  version: 0.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-17 00:00:00.000000000Z
+date: 2012-09-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70188603070240 !ruby/object:Gem::Requirement
+  requirement: &70242726597920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70188603070240
+  version_requirements: *70242726597920
 - !ruby/object:Gem::Dependency
   name: net-scp
-  requirement: &70188603069560 !ruby/object:Gem::Requirement
+  requirement: &70242726595840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70188603069560
+  version_requirements: *70242726595840
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70188603068820 !ruby/object:Gem::Requirement
+  requirement: &70242726593860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70188603068820
+  version_requirements: *70242726593860
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70188603067340 !ruby/object:Gem::Requirement
+  requirement: &70242726589620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70188603067340
+  version_requirements: *70242726589620
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70188603066660 !ruby/object:Gem::Requirement
+  requirement: &70242726587840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70188603066660
+  version_requirements: *70242726587840
 - !ruby/object:Gem::Dependency
   name: peach
-  requirement: &70188603065440 !ruby/object:Gem::Requirement
+  requirement: &70242726585820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70188603065440
+  version_requirements: *70242726585820
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &70188603064460 !ruby/object:Gem::Requirement
+  requirement: &70242726583840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70188603064460
+  version_requirements: *70242726583840
+- !ruby/object:Gem::Dependency
+  name: crack
+  requirement: &70242726582300 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70242726582300
 description: This command line tool will service a chef repo for building out, configuring,
   and deploying environments in EC2 and EC2 compatable infrastructure clouds
 email: