cluster 0.6.5 → 0.7.0

data/lib/cluster/cli.rb

@@ -11,7 +11,7 @@ class Cluster
       end
 
       if arguments.include?('--version')
-        puts "#{Cluster::NAME} version #{Cluster::Version::STRING}"
+        puts "#{Cluster::NAME} version #{Cluster.version}"
         exit 0
       end
 
@@ -52,18 +52,6 @@ class Cluster
         exit 1
       end
 
-      if command.downcase == 'gemurl'
-        # We don't need to do any infrastructure for this one...and 
-        # we may not have it yet...
-        puts Cluster::LOCATION
-        exit 0
-      elsif command.downcase == 'imageurl'
-        # We don't need to do any infrastructure for this one...and 
-        # we may not have it yet...
-        puts Cluster::IMAGES
-        exit 0
-      end
-
       file = File.open(logger_file, File::WRONLY | File::APPEND | File::CREAT)
 
       $stderr = file
@@ -139,6 +127,19 @@ class Cluster
       end
     end
 
+    def add_self(name, services)
+      @sub.update_instances
+      ins = @sub.current_instance
+      ins.state ||= 'starting'
+      ins.friendly_name = name
+      servs = services.split ','
+      unless servs.empty?
+        ins.enable servs
+      end
+      @sub.alter_instances! ins
+      puts ins.aws_id
+    end
+
     def enable(*params)
       service_list = params.shift
 
@@ -163,11 +164,18 @@ class Cluster
       alter_instances(params) {|ins| ins.disable servs }
     end
 
-    def label(name, id)
+    def label(name, id = nil)
+      id ||= @sub.current_instance.id
+
       alter_instances([id]) {|i| i.friendly_name = name.downcase}
     end
 
-    def unlabel(id)
+    def update_machines
+      @sub.update_machines
+    end
+
+    def unlabel(id = nil)
+      id ||= @sub.current_instance.id
       alter_instances([id]) {|i| i.friendly_name = ''}
     end
 

data/lib/cluster/infrastructures/amazon.rb

@@ -15,17 +15,24 @@ class Amazon < Infrastructure
       @options.cluster_bucket = creds['cluster_bucket']
       @options.bucket_key = creds['bucket_key']
       @options.cluster_domain = creds['cluster_domain']
-      @options.zone = creds['zone']
+      @options.zones = creds['zones']
       @options.volumes = creds['volumes']
+      @options.elb_name = creds['web']['elb_name']
     end
 
-    @options.key ||= ENV['AMAZON_ACCESS_KEY_ID'] 
-    @options.secret ||= ENV['AMAZON_SECRET_ACCESS_KEY'] 
+    @options.key ||= ENV['AWS_ACCESS_KEY'] 
+    @options.secret ||= ENV['AWS_SECRET_KEY'] 
     @options.owner ||= ENV['AMAZON_OWNER_ID'] 
     @options.cluster_bucket ||= ENV['CLUSTER_BUCKET']
     @options.bucket_key ||= 'cluster_credentials.yml'
-    @options.zone ||= ENV['AMAZON_ZONE']
+    @options.zones ||= if ENV['AMAZON_ZONE'].empty?
+                         nil
+                       else
+                         Array(ENV['AMAZON_ZONE'])
+                       end
+
     @options.cluster_domain ||= ENV['CLUSTER_DOMAIN'] || self.class.cluster_name
+    @options.elb_name ||= ENV['INGAMER_LOAD_BALANCER']
     @options.volumes ||= {}
 
     @options.role = (ENV['CLUSTER_ROLE'] or ENV['RAILS_ENV'] or 'production')
@@ -69,7 +76,7 @@ class Amazon < Infrastructure
       end
 
       o.on('-z', '--zone VAL', "Availability Zone") do |v|
-        @options.zone = v
+        @options.zones = Array(v)
       end
 
       o.on('--spot', "Use Spot Instances") do |v|
@@ -97,6 +104,10 @@ class Amazon < Infrastructure
     @@instances ||= load_instances
   end
 
+  def clear_instances
+    @@instances = nil
+  end
+
   def cost(sizes)
     unless @options.spot_instances
       puts "Cost only works for spot instances currently (ie. supply infrastructure argument of --spot"
@@ -122,15 +133,52 @@ class Amazon < Infrastructure
   end
 
   def load_instances
-    terminated = []
-    iss = ecc.describe_instances.map {|ins|
-      if %w(terminated shutting-down).include? ins[:aws_state]
-        terminated << ins[:aws_instance_id]
-        nil
-      else
-        AmazonInstance.new(ins)
+    begin
+      res = sdb.select "select * from #{domain} where entry='machine'"
+    rescue RightAws::AwsError
+      unless domains.include? domain
+        sdb.create_domain domain
+        retry
       end
-    }.compact
+    end
+    sdbs = self.class.from_sdb_results res
+
+    sdbs.map {|sd|
+      ins = AmazonInstance.new
+      ins.set_sdb_attributes sd
+      ins
+    }
+  end
+
+=begin
+  def add_instance(*services)
+    update_machines
+    ins = current_instance
+    ins.services = services
+    sdb.put_attributes domain, ins.aws_id, ins.attributes, :replace
+  end
+  alias :add_machine :add_instance
+=end
+
+  def instance_list
+    terminated = []
+    iss = @options.zones.map {|z|
+      e = ecc region: z
+      e.describe_instances.map {|ins|
+        if %w(terminated shutting-down).include? ins[:aws_state]
+          terminated << ins[:aws_instance_id]
+          nil
+        else
+          AmazonInstance.new(ins)
+        end
+      }.compact
+    }.flatten
+
+    [iss, terminated]
+  end
+
+  def update_instances
+    iss, terminated = instance_list
 
     begin
       res = sdb.select "select * from #{domain} where entry='machine'"
@@ -171,12 +219,13 @@ class Amazon < Infrastructure
     iss.each do |ins|
       if ins.no_sdb?
         puts "Cannot find cluster registration for #{ins.ec2_id} -- creating."
-        sdb.put_attributes domain, ins.aws_id, ins.attributes, :replace
       end
+      sdb.put_attributes domain, ins.aws_id, ins.attributes, :replace
     end
 
     iss
   end
+  alias :update_machines :update_instances
 
   def alter_instances!(*iss)
     list = iss.empty? ? instances : iss
@@ -318,58 +367,46 @@ class Amazon < Infrastructure
     @options.cluster_domain
   end
 
-  def sdb(params = {})
-    return @sdb if @sdb
-    @sdb = RightAws::SdbInterface.new(key, secret, connection_params(params))
-    unless @sdb
-      puts "Amazon cannot connect to SimpleDB"
-      exit 3
-    end
-    @sdb
+  def balance
+    eid = current_instance.ec2_id
+
+    elb.register_instances_with_load_balancer @options.elb_name, eid
   end
 
-  def connect_to_active_sdb(params = {})
-    RightAws::ActiveSdb.establish_connection key, secret, connection_params(params)
+  def sdb(o = nil)
+    params = connection_params o
+    params.delete :region
+    @sdb ||= RightAws::SdbInterface.new(key, secret, params)
   end
 
-  def sss(params = {})
-    return @s3 if @s3
-    @s3 = RightAws::S3.new(key, secret, connection_params(params))
-    unless @s3
-      puts "Amazon cannot connect to S3"
-      exit 3
-    end
-    @s3
+  def connect_to_active_sdb(o = nil)
+    params = connection_params o
+    params.delete :region
+    RightAws::ActiveSdb.establish_connection key, secret, params
   end
 
-  def sqs(params = {})
-    return @sqs if @sqs
-    @sqs = RightAws::SqsGen2.new(key, secret, connection_params(params))
-    unless @sqs
-      puts "Amazon cannot connect to S3"
-      exit 3
-    end
-    @sqs
+  def sss(o = nil)
+    params = connection_params o
+    params.delete :region
+    @sqs ||= RightAws::ElbInterface.new(key, secret, params)
   end
 
-  def elb(params = {})
-    return @elb if @elb
-    @elb = RightAws::ElbInterface.new(key, secret, connection_params(params))
-    unless @elb
-      puts "Amazon cannot connect to elb"
-      exit 3
-    end
-    @elb
+  def sqs(o = nil)
+    params = connection_params o
+    @sqs ||= {}
+    @sqs[params[:region]] ||= RightAws::ElbInterface.new(key, secret, params)
   end
 
-  def ecc(params = {})
-    return @ec2 if @ec2
-    @ec2 = RightAws::Ec2.new(key, secret, connection_params(params))
-    unless @ec2
-      puts "Amazon cannot connect to EC2"
-      exit 3
-    end
-    @ec2
+  def elb(o = nil)
+    params = connection_params o
+    @elb ||= {}
+    @elb[params[:region]] ||= RightAws::ElbInterface.new(key, secret, params)
+  end
+
+  def ecc(o = nil)
+    params = connection_params o
+    @ec2 ||= {}
+    @ec2[params[:region]] ||= RightAws::Ec2.new key, secret, params
   end
 
   def domains(reload = false)
@@ -399,13 +436,14 @@ class Amazon < Infrastructure
     @check = check
   end
 
-  def connection_params(params = {})
+  def connection_params(o = nil)
+    params = o ? o.clone : {}
     params = {:multi_thread => true} if params.empty?
-    unless params.include?(:logger) 
-      params.merge(:logger => logger)
-    else
-      params
-    end
+
+    params[:logger] ||= logger
+    params[:region] ||= @options.zones.first
+
+    params
   end
 
   def store(key, io)

data/lib/cluster/infrastructures/amazon_instance.rb

@@ -2,6 +2,8 @@ class AmazonInstance < Instance
   attr_accessor :ssh_key_name,
     :private_dns_name,
     :dns_name,
+    :private_ip_address,
+    :ip_address,
     :aws_image_id,
     :spot_price,
     :aws_groups,
@@ -34,7 +36,11 @@ class AmazonInstance < Instance
   end
 
   def ip
-    Infrastructure.dns.getaddress(dns).to_s
+    if Infrastructure.in_cluster?
+      private_ip_address
+    else
+      ip_address
+    end
   end
 
   def id
@@ -56,9 +62,9 @@ class AmazonInstance < Instance
       when 'entry', 'ec2_id'
         # NOP
       when 'services'
-        @services = v.is_a?(Array) ? v : Array(v)
+        @services = Array(v)
       when 'disabled_services'
-        @disabled_services = v.is_a?(Array) ? v : Array(v)
+        @disabled_services = Array(v)
       else
         self.send("#{k}=", v)
       end
@@ -79,7 +85,7 @@ class AmazonInstance < Instance
   end
 
   def fields
-    %w(aws_id label start_time_sorted spot_price services disabled_services friendly_name ec2_id state)
+    %w(aws_id label start_time_sorted spot_price services disabled_services friendly_name ec2_id state ip_address private_ip_address dns_name private_dns_name)
   end
 
   def attributes
@@ -144,67 +150,7 @@ class AmazonInstance < Instance
   end
 
   def user_data
-    %Q@#!/bin/bash
-
-    CLUSTER_USER=ubuntu
-    CLUSTER_DIR=/home/${CLUSTER_USER}/.cluster
-    LOGGER=${CLUSTER_DIR}/cluster.log
-    MONITOR=${CLUSTER_DIR}/monitor.god
-    CREDENTIALS=${CLUSTER_DIR}/credentials.yml
-    CLUSTER_EXECUTABLE=$(which cluster)
-    GEM_PATH=$(gem env gempath)
-    GEM_BIN_DIR=$(dirname ${CLUSTER_EXECUTABLE})
-    GOD=$(type -p god)
-
-    if [[ ! -e $CLUSTER_DIR ]]; then
-      mkdir -m 700 $CLUSTER_DIR
-    fi
-
-    if [[ ! -e $CREDENTIALS ]]; then
-      wget --no-check-certificate -O $CREDENTIALS '#{amazon.credentials_url}'
-    fi
-
-    if [[ ! -e $CREDENTIALS ]]; then
-      echo "Cannot start without credentials! (perhaps a cluster save_credentials is in order)"
-      exit 1
-    fi
-
-    chmod 600 $CREDENTIALS
-    chown $CLUSTER_USER $CREDENTIALS
-    cat >>$CREDENTIALS <<EOF
-    cluster:
-      id: #{aws_id}
-      services: #{services.join(' ')}
-    EOF
-
-    CLUSTER='X'
-    if type -P cluster >/dev/null; then
-      CLUSTER=cluster
-    elif [[ -x $GEM_BIN_DIR/cluster ]]; then
-      CLUSTER="$GEM_BIN_DIR/cluster"
-    fi
-
-    if [[ ! $CLUSTER == 'X' ]]; then
-      CLUSTER="$CLUSTER --credentials=${CREDENTIALS} --logger=${LOGGER}"
-      $CLUSTER instance_state starting
-
-      $CLUSTER fetch_monitor ${MONITOR}
-      if [[ -e $MONITOR ]]; then
-        chmod 600 $MONITOR
-        chown $CLUSTER_USER $MONITOR
-        mv $MONITOR /etc/god/init.d/010_cluster.god
-        $GOD load /etc/god/init.d/010_cluster.god
-      else
-        echo "NO MONITOR FILE!"
-        exit 1
-      fi
-    else
-      echo "NO CLUSTER!"
-      exit 1
-    fi
-
-    chown -R $CLUSTER_USER:$CLUSTER_USER $CLUSTER_DIR
-    @.gsub(/^    /, '')
+    ''
   end
 
   def set_state(state)

data/lib/cluster/instance.rb

@@ -39,10 +39,6 @@ class Instance
     self.id == arg or self.label == arg or self.dns == arg or self.friendly_name == arg
   end
 
-  def state
-    @state ||= 'spinning'
-  end
-
   def services
     @services ||= []
   end

data/lib/cluster/version.rb

@@ -4,22 +4,10 @@ class Cluster
   AUTHOR = 'Simon de Boer'
   EMAIL = 'sdeboer@InGamerSports.com'
   NAME = 'cluster'
-  BUCKET = 'oven'
-  LOCATION = "http://oven.s3.amazonaws.com/cluster.gem"
-  IMAGES = 'http://oven.s3.amazonaws.com/cluster_images.yml'
-
-  # Describes the current version of Capistrano.
-  class Version < Net::SSH::Version
-    MAJOR = 0
-    MINOR = 6
-    TINY  = 5
-
-    # The current version, as a Version instance
-    CURRENT = new(MAJOR, MINOR, TINY)
-
-    # The current version, as a String instance
-    STRING  = CURRENT.to_s
 
+  class << self
+    def version
+      Gem::Version.create('0.7.0')
+    end
   end
-
 end

data/user_data_web.sh

@@ -0,0 +1,96 @@
+#!/bin/bash
+FRIENDLY=noble
+SERVICES=web
+
+CLUSTER_USER=ubuntu
+CLUSTER_DIR=/home/${CLUSTER_USER}/.cluster
+LOGGER=${CLUSTER_DIR}/cluster.log
+# MONITOR=${CLUSTER_DIR}/monitor.god
+CREDENTIALS=${CLUSTER_DIR}/credentials.yml
+CLUSTER_EXECUTABLE=$(which cluster)
+GEM_PATH=$(gem env gempath)
+GEM_BIN_DIR=$(dirname ${CLUSTER_EXECUTABLE})
+# GOD=$(type -p god)
+
+CLUSTER='X'
+if type -P cluster >/dev/null; then
+  CLUSTER=cluster
+elif [[ -x $GEM_BIN_DIR/cluster ]]; then
+  CLUSTER="$GEM_BIN_DIR/cluster"
+fi
+
+if [[ ! $CLUSTER == 'X' ]]; then
+  CLUSTER="$CLUSTER --credentials=${CREDENTIALS} --logger=${LOGGER}"
+else
+  echo "Cannot start without cluster command"
+  exit 1
+fi
+
+aws_id=$(${CLUSTER} add_self ${FRIENDLY} ${SERVICES})
+
+echo >${CREDENTIALS} <<EOF
+cluster:
+  id: ${aws_id}
+  services: ${SERVICES}
+EOF
+chown ${CLUSTER_USER}:${CLUSTER_USER} ${CREDENTIALS}
+chmod 600 ${CREDENTIALS}
+
+user=app
+home=/mnt/home/${user}
+app=${home}/inGamer
+shared=${app}/shared
+log=${shared}/log
+cache=${shared}/cached-copy
+ssh=${home}/.ssh
+repo=$(${CLUSTER} service -d repository)
+git_url="git://#{repo}/FireCat"
+branch=origin/release
+shared=/mnt/shared
+bundles=${shared}/bundles
+
+if [[ ! -e $ssh ]]; then
+  mkdir -m 700 $ssh
+fi
+
+ssh-keyscan -t dsa,rsa -H ${repo} localhost >>${ssh}/known_hosts
+${CLUSTER} retrieve web ${user}/authorized_keys ${ssh}/authorized_keys
+wget -O /tmp/run_key http://169.254.169.254/latest/meta-data/public-keys/0/openssh-key
+cat /tmp/run_key >>${ssh}/authorized_keys
+rm /tmp/run_key
+chmod 600 ${ssh}/*
+chown -R ${user}:${user} ${ssh}
+
+if [[ ! -e $log ]]; then
+  mkdir -p $log
+  chown -R ${user}:${user} ${app}
+fi
+
+if [[ ! -e $shared ]]; then
+  mkdir -m 1777 $shared
+fi
+
+if [[ ! -e $bundles ]]; then
+  mkdir -m 777 $bundles
+fi
+
+${CLUSTER} instance_state cloning
+if [[ ! -e $cache ]]; then
+  su -l ${user} -c "cd ${cache}; git pull; git checkout deploy; git merge ${branch}"
+else
+  git clone ${git_url} ${cache}
+  chown -R ${user}:${user} ${cache}
+  su -l ${user} -c "cd ${cache}; git checkout -q -b deploy ${branch}"
+fi
+
+su -l ${user} -c "cd ${cache}; export NO_CAPS=true; APP_HOME=${cache}; cap local deploy:setup && cap local deploy"
+
+${CLUSTER} instance_state httpd
+
+cd ${cache}/cluster/services.d/web/apache.d
+
+source ./config.sh
+apache2ctl graceful
+
+${CLUSTER} balance
+${CLUSTER} instance_state running