veronic 0.0.9 → 0.0.11

data/bin/veronic

@@ -26,6 +26,7 @@ opt_parser = OptionParser.new do |opt|
   opt.separator  "     start: start box"
   opt.separator  "     list: list boxes"
   opt.separator  "     status: status boxes"
+  opt.separator  "     create_image: create an image with the box"
   opt.separator  ""
   opt.separator  "Options"
 
@@ -84,11 +85,21 @@ opt_parser = OptionParser.new do |opt|
     options[:security_groups] = s
   end
 
+  options[:ami_image] = ENV['ami_image']
+  opt.on("-I","--ami_image ami_image","Which ami_image use for the box") do |i|
+    options[:ami_image] = i
+  end
+
   options[:deploy_cmd] = ENV['deploy_cmd']
-  opt.on("-D","--deploy_cmd security_groups","Which command line us to deploy the box") do |dc|
+  opt.on("-D","--deploy_cmd commad-line","Which command line us to deploy the box") do |dc|
     options[:deploy_cmd] = dc
   end
 
+  options[:verbose] = ENV['verbose']
+  opt.on("-v","--verbose debug","Which verbose level us to deploy the box") do |v|
+    options[:verbose] = v
+  end
+
   opt.on("-h","--help","help")
 end
 
@@ -119,6 +130,9 @@ when "list"
   Veronic::Deployer.new(options).instances_list
 when "status"
   puts Veronic::Deployer.new(options).status
+when "create_image"
+  image = Veronic::Deployer.new(options).create_image
+  puts "ID: #{image.id}", "NAME: #{image.name}", "STATE: #{image.state}"
 else
 	puts opt_parser
 end

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
+		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
 
 		def initialize(options={})
 			config_file = File.exists?('/etc/veronic/veronic.yml') ? '/etc/veronic/veronic.yml' : '../../' + File.dirname($0) + '/veronic.yml'
@@ -34,7 +34,8 @@ module Veronic
 			@security_groups                	= [options[:security_groups]] 											|| [config_from_file['security_groups']]
 			@deploy_cmd                     	= options[:deploy_cmd] 													|| config_from_file['deploy_cmd'] || 'sudo chef-client'
 			@name                           	= (options[:branch] || config_from_file['branch']) ? (options[:branch] 	|| config_from_file['branch']) : (options[:name] || config_from_file['name'])
-			@image 								= nil
+			@image 								= options[:ami_image] 													|| config_from_file['ami_image']
+			@verbose 							= options[:verbose] 													|| config_from_file['verbose']
 		end
 
 		def to_hash

data/lib/providers/chefserver/chefserver.rb

@@ -7,7 +7,19 @@ require 'tempfile'
 require 'highline'
 require 'net/ssh'
 require 'net/ssh/multi'
+require 'chef/knife'
+require 'chef/knife/ec2_server_create'
+require 'chef/knife/ec2_server_delete'
+require 'chef/knife/bootstrap'
+require 'chef/knife/ssh'
+require 'chef/knife/node_run_list_add'
+require 'chef/knife/core/bootstrap_context'
+require 'chef/knife/ec2_base'
+require 'chef/node'
+
+require_relative 'rest_request'
 require_relative 'instance'
+require_relative 'client'
 
 module Provider
 	class ChefServer
@@ -47,7 +59,11 @@ module Provider
 		end
 
 		def instance
-			instance = Provider::ChefServer::Instance.new(@config)
+			node = Provider::ChefServer::Instance.new(@config)
+		end
+
+		def client
+			node = Provider::ChefServer::Client.new(@config)
 		end
 		
 	end

data/lib/providers/chefserver/client.rb

@@ -0,0 +1,27 @@
+module Provider
+	class ChefServer
+		class Client
+
+			def initialize(name)
+				@name = name
+			end
+
+			def destroy(name=nil)
+				puts "Destroying client #{@name} ..."
+				
+				knife = Chef::Knife.new()
+				knife.config[:yes] = true
+				knife.delete_object(Chef::ApiClient, @name) if self.exists?
+			end
+
+			def exists?
+				begin
+					Chef::ApiClient.load(@name)
+				rescue					
+					return false
+				end		
+				return true
+			end
+		end
+	end
+end

data/lib/providers/chefserver/instance.rb

@@ -1,15 +1,3 @@
-require 'chef/knife'
-require 'chef/knife/ec2_server_create'
-require 'chef/knife/ec2_server_delete'
-require 'chef/knife/bootstrap'
-require 'chef/knife/ssh'
-require 'chef/knife/node_run_list_add'
-require 'chef/knife/core/bootstrap_context'
-require 'chef/knife/ec2_base'
-require 'chef/node'
-
-require_relative 'rest_request'
-
 module Provider
 	class ChefServer
 		class Instance
@@ -126,6 +114,14 @@ module Provider
 				sys_status =  knife_ssh.run
 			end
 
+			def client
+				Provider::ChefServer::Client.new(@name)
+			end
+
+			def delete_client_key(node, client_key="/etc/chef/client.pem")
+				puts "Deleting client_key #{client_key}"
+				self.ssh(node, "sudo rm -f #{client_key}", true)
+			end
 		end
 	end
 end

data/lib/providers/cloudprovider.rb

@@ -13,8 +13,8 @@ class CloudProvider
 		CLOUDPROVIDERS[@config[:cloudprovider]].new(@config)
 	end
 
-	def image
-		@provider.image
+	def image(name=nil)
+		@provider.image(name)
 	end
 
 	def instance

data/lib/providers/configprovider.rb

@@ -20,4 +20,8 @@ class ConfigProvider
 	def instance
 		@provider.instance
 	end
+
+	def client
+		@provider.client
+	end
 end

data/lib/providers/ec2/ec2.rb

@@ -14,12 +14,12 @@ module Provider
 			@ec2 				= ec2
 		end
 
-		def image
-			Provider::Ec2::Image.new(@ec2, @environment, @owner_id)
+		def image(name=nil)
+			Provider::Ec2::Image.new(@ec2, @environment, @owner_id, name)
 		end
 
 		def instance
-			Provider::Ec2::Instance.new(@ec2, @name)
+			Provider::Ec2::Instance.new(@ec2, @name, @environment)
 		end
 
 		def instances

data/lib/providers/ec2/image.rb

@@ -2,12 +2,58 @@ module Provider
 	class Ec2
 		class Image
 
-			def initialize(ec2, environment, owner_id)
-				@image = ec2.images.with_owner(owner_id).select {|x| x.name == environment + '-ami'}.first	
+			def initialize(ec2, environment, owner_id, name=nil)
+				@ec2 = ec2
+				@environment = environment
+				@name = name
+				@ami_name = @name || @environment + '-ami'
+				@owner_id = owner_id
 			end
 
 			def id
-				@image.id
+				if image
+					@image.id
+				end
+			end
+
+			def detroy
+				puts "Destroying image #{@ami_name}..."
+				if image
+					begin
+						@image.deregister
+						puts "Image #{@ami_name} destroyed"
+					rescue
+						return false
+					end
+				end
+				return true
+			end
+
+			def image
+				puts "Getting image #{@ami_name}..."
+				@image = get_image
+				unless @image
+					sleep 5
+					@image = get_image
+				end
+				if @image
+					while @image.exists? == false && @image.state != :failed
+						print "."
+						sleep 1
+					end
+					while @image.state == :pending && @image.state != :failed
+						print "."
+						sleep 1
+					end
+					puts ""
+					return @image
+				else
+					return false
+				end
+			end
+
+			def get_image
+				@ec2.images.with_owner(@owner_id).select {|x| x.name == @ami_name}.first
 			end
 
 		end

data/lib/providers/ec2/instance.rb

@@ -2,9 +2,10 @@ module Provider
 	class Ec2
 		class Instance
 
-			def initialize(ec2, name)
+			def initialize(ec2, name, environment)
 				@ec2 = ec2
 				@name = name
+				@environment = environment
 		       	@instance = instance
 		    end
 
@@ -77,6 +78,22 @@ module Provider
 					@ec2.instances.select {|x| x.tags['Name'] == @name && x.status != :shutting_down && x.status != :terminated}.first
 				end
 			end
+
+			def create_image(name=nil)
+				@ami_name = name || @environment + '-ami'
+				puts "Create image #{@ami_name}"
+				image = @instance.create_image(@ami_name, { :no_reboot => true })
+				while image.exists? == false && image.state != :failed
+					print "."
+					sleep 1
+				end
+				while image.state == :pending && image.state != :failed
+					print "."
+					sleep 1
+				end
+				puts ""
+				return image
+			end
 					
 		end
 	end

data/lib/veronic.rb

@@ -54,7 +54,7 @@ module Veronic
 				deploy_stacks
 			end
 			query = cloudprovider.instance.dns_name
-			deploy_cmd = "sudo chef-client -o 'recipe[lift_envs::app_deploy]' #{config_hash[:verbose] ? '-l ' + config_hash[:verbose] : ''}"
+			deploy_cmd = "sudo chef-client -o 'recipe[lift_envs::app_deploy]' #{@config.verbose ? '-l ' + @config.verbose : ''}"
 			manual = true
 			configprovider.ssh(query, deploy_cmd, manual)
 		end
@@ -65,16 +65,16 @@ module Veronic
 				deploy_apps
 			end
 			query = cloudprovider.instance.dns_name
-			deploy_cmd = "sudo chef-client -o 'recipe[lift_envs::app_testing]' #{config_hash[:verbose] ? '-l ' + config_hash[:verbose] : ''}"
+			deploy_cmd = "sudo chef-client -o 'recipe[lift_envs::app_testing]' #{@config.verbose ? '-l ' + @config.verbose : ''}"
 			manual = true
 			configprovider.ssh(query, deploy_cmd, manual)
 		end
 
 		def destroy
-			config_hash[:dnsprovider_zones].each do |z|
+			@config.dnsprovider_zones.each do |z|
 				@config.zone_name 	= z['zone_name']
 				@config.zone_url 	= z['zone_url']
-				dns 				= "#{config_hash[:name]}.#{z['zone_name']}"
+				dns 				= "#{@config.name}.#{z['zone_name']}"
 				puts 				"Setting DNS #{dns} ..."
 				record 				= dnsprovider.zone.record(dns, [], "A", "1").delete
 				puts 				"DNS #{dns} deleted"
@@ -101,10 +101,10 @@ module Veronic
 		end
 
 		def update_instance_dns
-			config_hash[:dnsprovider_zones].each do |z|
+			@config.dnsprovider_zones.each do |z|
 				@config.zone_name 	= z['zone_name']
 				@config.zone_url 	= z['zone_url']
-				dns 				= "#{config_hash[:name]}.#{z['zone_name']}"
+				dns 				= "#{@config.name}.#{z['zone_name']}"
 				puts 				"Setting DNS #{dns} ..."
 				record 				= dnsprovider.zone.record(dns, [cloudprovider.instance.public_ip_address], "A", "1").wait_set
 				puts 				"DNS #{dns} updated"
@@ -126,7 +126,7 @@ module Veronic
 		end
 
 		def status
-			if config_hash[:name]
+			if @config.name
 				return cloudprovider.instance.status
 			else
 				return "Arguments name missing"
@@ -134,25 +134,36 @@ module Veronic
 		end
 
 		def bootstrap
-			get_image
+			status = false
 			if cloudprovider.instance.status == :running
-				puts "#{config_hash[:name]} is running"		
+				puts "#{@config.name} is running"	
 			elsif cloudprovider.instance.status == :stopped
 				start
 			elsif cloudprovider.instance.exist? == false
+				get_image
 				configprovider.instance.bootstrap 
-				set_node
 				update_instance_dns
-				return true
+				status = true
 			else
 				abort('Error during connecting instance')  
 			end
 			set_node
-			return false
+			return status
+		end
+
+		def create_image
+			unless @config.environment
+				abort('Arguments "environment" missing') 
+			else
+				configprovider.instance.client.destroy
+				configprovider.instance.delete_client_key(cloudprovider.instance.dns_name)
+				cloudprovider.image.detroy
+				cloudprovider.instance.create_image
+			end
 		end
 
 		def set_node
-			if config_hash[:role] && config_hash[:environment]
+			if @config.role && @config.environment
 				configprovider.instance.set_environment
 				configprovider.instance.set_role
 			else
@@ -161,10 +172,14 @@ module Veronic
 		end
 
 		def get_image
-			if config_hash[:environment]
-				@config.image = cloudprovider.image.id
+			if @config.image.nil?
+				unless @config.environment
+					abort('Arguments "environment" missing') 
+				else
+					@config.image = cloudprovider.image.id
+				end
 			else
-				abort('Arguments "environment" missing') 
+				@config.image = cloudprovider.image(@config.image).id
 			end
 		end
 	end

data/veronic.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'veronic'
-  s.version     = '0.0.9'
+  s.version     = '0.0.11'
   s.date        = '2013-04-05'
   s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.summary     = "Veronic, deux qui la tiennent trois qui la niquent"

data/veronic.yml

@@ -20,6 +20,7 @@ ssh_user:
 ssh_port:
 role:
 flavor:
+ami_image: 
 security_groups: 
 deploy_cmd: 
 verbose: 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: veronic
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -88,6 +88,7 @@ files:
 - bin/veronic
 - lib/config/config.rb
 - lib/providers/chefserver/chefserver.rb
+- lib/providers/chefserver/client.rb
 - lib/providers/chefserver/instance.rb
 - lib/providers/chefserver/rest_request.rb
 - lib/providers/cloudprovider.rb