veronic 0.0.21 → 0.0.22

data/bin/veronic

@@ -18,6 +18,7 @@ opt_parser = OptionParser.new do |opt|
   opt.separator  "     bootstrap: bootstrap box"
   opt.separator  "     destroy: destroy box"
   opt.separator  "     deploy: deploy box"
+  opt.separator  "     search_and_deploy: search & deploy box"
   opt.separator  "     deploy_stacks: deploy stacks on box"
   opt.separator  "     deploy_apps: destroy apps on box"
   opt.separator  "     run_tests: tests apps on box"
@@ -95,6 +96,11 @@ opt_parser = OptionParser.new do |opt|
     options[:deploy_cmd] = dc
   end
 
+  options[:query] = ENV['query']
+  opt.on("-q","--query query-line","Which query line us to deploy the boxes") do |q|
+    options[:query] = q
+  end
+
   options[:verbose] = ENV['verbose']
   opt.on("-v","--verbose debug","Which verbose level us to deploy the box") do |v|
     options[:verbose] = v
@@ -114,6 +120,8 @@ when "destroy"
 	Veronic::Deployer.new(options).destroy
 when "deploy"
   Veronic::Deployer.new(options).deploy
+when "search_and_deploy"
+  Veronic::Deployer.new(options).search_and_deploy
 when "deploy_stacks"
   Veronic::Deployer.new(options).deploy_stacks
 when "deploy_apps"

data/lib/config/config.rb

@@ -1,6 +1,6 @@
 module Veronic
 	class Config
-		attr_accessor  :dnsprovider, :cloudprovider, :configprovider, :dnsprovider_access_key_id, :dnsprovider_secret_access_key, :cloudprovider_access_key_id, :cloudprovider_secret_access_key, :cloudprovider_images_owner_id, :dnsprovider_zones, :region, :availability_zone, :aws_ssh_key_id, :node_name, :client_key, :validation_client_name, :validation_key, :chef_server_url, :ssl_version, :identity_file, :branch, :environment, :ssh_user, :ssh_port, :role, :flavor, :security_groups, :deploy_cmd, :name, :image, :zone_name, :zone_url, :verbose
+		attr_accessor  :dnsprovider, :cloudprovider, :configprovider, :dnsprovider_access_key_id, :dnsprovider_secret_access_key, :cloudprovider_access_key_id, :cloudprovider_secret_access_key, :cloudprovider_images_owner_id, :dnsprovider_zones, :region, :availability_zone, :aws_ssh_key_id, :node_name, :client_key, :validation_client_name, :validation_key, :chef_server_url, :ssl_version, :identity_file, :branch, :environment, :ssh_user, :ssh_port, :role, :flavor, :security_groups, :deploy_cmd, :name, :image, :zone_name, :zone_url, :verbose, :query
 
 		def initialize(options={})
 			config_file = File.exists?('/etc/veronic/veronic.yml') ? '/etc/veronic/veronic.yml' : '../../' + File.dirname($0) + '/veronic.yml'
@@ -36,6 +36,7 @@ module Veronic
 			@name                             = (options[:branch] || config_from_file['branch']) ? (options[:branch] 	|| config_from_file['branch']) : (options[:name] || config_from_file['name'])
 			@image                            = options[:ami_image]                         || config_from_file['ami_image']
 			@verbose                          = options[:verbose]                           || config_from_file['verbose']
+			@query                            = options[:query]                         	|| config_from_file['query']
 		end
 
 		def to_hash

data/lib/providers/chefserver/instance.rb

@@ -13,6 +13,7 @@ module Provider
 				@identity_file                                = config[:identity_file]
 				@aws_ssh_key_id                               = config[:aws_ssh_key_id]
 				@environment                                  = config[:environment]
+        @role                                         = config[:role]
 				@roles                                        = "role[#{config[:role]}]"
 				@flavor                                       = config[:flavor]
 				@region                                       = config[:region]
@@ -105,10 +106,10 @@ module Provider
 			def set_environment
 				node = Chef::Node.new.tap do |n|
 					n.name( @name )
-          			n.chef_environment( @environment )
-          		end
-          		node.save
-          		puts "Environment: #{@environment}"
+          n.chef_environment( @environment )
+        end
+        node.save
+        puts "Environment: #{@environment}"
 			end
 
 			def ssh(query, cmd_line, manual)
@@ -118,6 +119,15 @@ module Provider
 				knife_ssh.config[:ssh_user]       = @ssh_user
 				knife_ssh.config[:identity_file]  = @identity_file
 				knife_ssh.config[:log_level]      = @verbose
+        
+        unless manual
+          if @environment
+            query += "#{query.empty? ? '' : ' AND'} chef_environment:#{@environment}"
+          end
+          if @role
+            query += "#{query.empty? ? '' : ' AND'} role:#{@role}"
+          end
+        end
 
 				knife_ssh.name_args = [query, cmd_line]
 				sys_status =  knife_ssh.run
@@ -129,7 +139,7 @@ module Provider
 
 			def delete_client_key(node, client_key="/etc/chef/client.pem")
 				puts "Deleting client_key #{client_key}"
-				self.ssh(node, "sudo chef-client -W ; sudo rm -f #{client_key}", true)
+				self.ssh(node, "sudo chef-client -W > /dev/null ; sudo rm -f #{client_key}", true)
 			end
 		end
 	end

data/lib/providers/cloudprovider.rb

@@ -13,8 +13,8 @@ class CloudProvider
 		CLOUDPROVIDERS[@config[:cloudprovider]].new(@config)
 	end
 
-	def image(name=nil)
-		@provider.image(name)
+	def image
+		@provider.image
 	end
 
 	def instance
@@ -25,6 +25,10 @@ class CloudProvider
 		@provider.instances
 	end
 
+	def regions
+		@provider.regions
+	end
+
 	def instances_list
 		printf "%17s %35s %34s\n", 'NAME', 'DNS', 'STATUS'
 		@provider.instances.each do |instance|

data/lib/providers/ec2/ec2.rb

@@ -8,19 +8,20 @@ module Provider
 		def initialize(config)
 			@name                = config[:name]
 			@region              = config[:region] 
-			@environment         = config[:environment]
+			@role                = config[:role]
 			@access_key_id       = config[:cloudprovider_access_key_id]
 			@secret_access_key   = config[:cloudprovider_secret_access_key]
 			@owner_id            = config[:cloudprovider_images_owner_id]
+			@image               = config[:image]
 			@ec2                 = ec2
 		end
 
-		def image(name=nil)
-			Provider::Ec2::Image.new(@ec2, @environment, @owner_id, name)
+		def image
+			Provider::Ec2::Image.new(@ec2, @role, @owner_id, @image)
 		end
 
 		def instance
-			Provider::Ec2::Instance.new(@ec2, @name, @environment)
+			Provider::Ec2::Instance.new(@ec2, @name, @image)
 		end
 
 		def instances
@@ -29,8 +30,16 @@ module Provider
 			end
 		end
 
+		def regions
+			AWS.memoize do
+				@ec2.regions
+			end
+		end
+
 		def ec2
-			AWS::EC2.new(:access_key_id => @access_key_id, :secret_access_key => @secret_access_key, :region => @region)
+			AWS.memoize do
+				AWS::EC2.new(:access_key_id => @access_key_id, :secret_access_key => @secret_access_key, :region => @region)
+			end
 		end
 
 	end

data/lib/providers/ec2/image.rb

@@ -2,11 +2,10 @@ module Provider
 	class Ec2
 		class Image
 
-			def initialize(ec2, environment, owner_id, name=nil)
+			def initialize(ec2, role, owner_id, ami_name)
 				@ec2 = ec2
-				@environment = environment
-				@name = name
-				@ami_name = @name || @environment + '-ami'
+				@role = role
+				@ami_name = ami_name
 				@owner_id = owner_id
 			end
 

data/lib/providers/ec2/instance.rb

@@ -2,26 +2,25 @@ module Provider
 	class Ec2
 		class Instance
 
-			def initialize(ec2, name, environment)
+			def initialize(ec2, name, image)
 				@ec2 = ec2
 				@name = name
-				@environment = environment
-		       	@instance = instance
-		    end
+		    @instance = instance
+		    @image = image
+		  end
 
 			def stop
 				print "Stopping instance #{@name}..."
 				if self.exist?
 					@instance.stop
-					@i = 0
+					i = 0
 					while self.status != :stopped
-						if @i > 120 
-							return false
-						end
-						print "." ; sleep 3 ; @i += 1
+            print "." ; sleep 3 ; i += 1
+						return false if i > 120
 					end
+          puts "\nInstance #{@name} is stopped"
 				end
-				puts "\nInstance #{@name} is stopped"
+				return true
 			end
 
 			def start
@@ -31,15 +30,14 @@ module Provider
 						sleep 2
 					end
 					@instance.start
-					@i = 0 					
+					i = 0 					
 					while self.status != :running
-						if @i > 120 
-							return false
-						end
-						print "." ; sleep 3 ; @i += 1
+						print "." ; sleep 3 ; i += 1
+						return false if i > 120
 					end
+          puts "\nInstance #{@name} is started"
 				end
-				puts "\nInstance #{@name} is started"
+        return true
 			end
 
 			def exist?
@@ -79,8 +77,8 @@ module Provider
 				end
 			end
 
-			def create_image(name=nil)
-				@ami_name = name || @environment + '-ami'
+			def create_image
+				@ami_name = @image || @name
 				puts "Create image #{@ami_name}"
 				image = @instance.create_image(@ami_name, { :no_reboot => true })
 				while image.exists? == false && image.state != :failed
@@ -94,6 +92,14 @@ module Provider
 				puts ""
 				return image
 			end
+
+			def tags(hash={})
+				puts "Tagging instance ..."
+				hash.keys.each do |k|
+					puts k + ': ' + hash[k]
+					@instance.tags[k] = hash[k]
+				end
+			end
 					
 		end
 	end

data/lib/veronic.rb

@@ -97,13 +97,22 @@ module Veronic
 			configprovider.ssh(query, @config.deploy_cmd, manual)
 		end
 
+		def search_and_deploy
+			unless @config.deploy_cmd || @config.query
+				abort('Arguments --deploy_cmd or --query is missing')
+			end 
+			query = @config.query
+			manual = false
+			configprovider.ssh(query, @config.deploy_cmd, manual)
+		end
+
 		def update_instance_dns
 			@config.dnsprovider_zones.each do |z|
 				@config.zone_name 	= z['zone_name']
 				@config.zone_url 	= z['zone_url']
 				dns 				= "#{@config.name}.#{z['zone_name']}"
 				puts 				"Setting DNS #{dns} ..."
-				record 				= dnsprovider.zone.record(dns, [cloudprovider.instance.public_ip_address], "A", "1").wait_set
+				record 				= dnsprovider.zone.record(dns, [cloudprovider.instance.dns_name], "CNAME", "1").wait_set
 				puts 				"DNS #{dns} updated"
 			end
 		end
@@ -118,7 +127,7 @@ module Veronic
 
 		def start
 			unless cloudprovider.instance.start == false
-				update_instance_dns
+				exit 1
 			end
 		end
 
@@ -137,10 +146,10 @@ module Veronic
 			elsif cloudprovider.instance.status == :stopped
 				start
 			elsif cloudprovider.instance.exist? == false
+				@config.availability_zone = get_availability_zone
 				get_image
 				configprovider.instance.client.destroy
 				configprovider.instance.bootstrap 
-				update_instance_dns
 				status = true
 			else
 				abort('Error during connecting instance')  
@@ -150,20 +159,21 @@ module Veronic
 		end
 
 		def create_image
-			unless @config.environment
-				abort('Arguments --environment is missing') 
-			else
-				configprovider.instance.delete_client_key(cloudprovider.instance.dns_name)
-				configprovider.instance.client.destroy
-				cloudprovider.image.detroy
-				cloudprovider.instance.create_image
-			end
+			configprovider.instance.delete_client_key(cloudprovider.instance.dns_name)
+			configprovider.instance.client.destroy
+			cloudprovider.image.detroy
+			cloudprovider.instance.create_image
 		end
 
 		def set_node
+			update_instance_dns
 			if @config.role && @config.environment
 				configprovider.instance.set_environment
 				configprovider.instance.set_role
+				cloudprovider.instance.tags({'role' => @config.role, 'environment' => @config.environment})
+				if configprovider.instance.delete_client_key(cloudprovider.instance.dns_name)
+					configprovider.instance.client.destroy
+				end
 			else
 				abort('Arguments --role or --environment is missing') 
 			end
@@ -171,13 +181,36 @@ module Veronic
 
 		def get_image
 			if @config.image.nil?
-				unless @config.environment
-					abort('Arguments --environment is missing') 
-				else
-					@config.image = cloudprovider.image.id
-				end
+				abort('Arguments --ami_image is missing') 
 			else
-				@config.image = cloudprovider.image(@config.image).id
+				@config.image = cloudprovider.image.id
+			end
+		end
+
+		def get_availability_zone
+			puts "Getting availability zone ..."
+			environments = {}
+			if @config.availability_zone.nil? || @config.availability_zone == 'auto'
+				cloudprovider.regions.each do |region|
+					region.instances.each do |instance|
+						if instance.tags[:environment] && instance.tags[:role] && instance.status != :shutting_down && instance.status != :terminated
+							environments[instance.tags[:environment]] = {} unless environments[instance.tags[:environment]]
+							environments[instance.tags[:environment]][instance.tags[:role]] = {} unless environments[instance.tags[:environment]][instance.tags[:role]]
+							environments[instance.tags[:environment]][instance.tags[:role]][region.name] = {} unless environments[instance.tags[:environment]][instance.tags[:role]][region.name]
+							region.availability_zones.each do |availability_zone|
+								environments[instance.tags[:environment]][instance.tags[:role]][region.name][availability_zone.name] = [] unless environments[instance.tags[:environment]][instance.tags[:role]][region.name][availability_zone.name]
+							end
+							environments[instance.tags[:environment]][instance.tags[:role]][region.name][instance.availability_zone] << instance.id
+						end
+					end
+				end
+			end
+			if environments[@config.environment] && environments[@config.environment][@config.role] && environments[@config.environment][@config.role][@config.region]
+				availability_zones = environments[@config.environment][@config.role][@config.region].sort_by { |availability_zone| availability_zone[1].count }
+				puts "Zones: " + availability_zones.to_s
+				availability_zone = availability_zones.first
+				puts "Zone selected: " + availability_zone[0]
+				availability_zone[0]
 			end
 		end
 	end

data/veronic.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'veronic'
-  s.version     = '0.0.21'
+  s.version     = '0.0.22'
   s.date        = '2013-04-05'
   s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.summary     = "Veronic, a simple cloud deployer"
@@ -14,5 +14,5 @@ Gem::Specification.new do |s|
   s.add_dependency('knife-ec2')
   s.add_dependency('aws-sdk')
   s.add_dependency('route53')
-  s.add_dependency('excon', '= 0.21.0')
+  s.add_dependency('excon', '~> 0.23.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: veronic
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
   prerelease: 
 platform: ruby
 authors:
@@ -80,17 +80,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.23.0
 description: A simple cloud deployer
 email: gabriel.klein.fr@gmail.com
 executables: