boxgrinder-build 0.3.2 → 0.3.3

data/README

@@ -1,4 +1,7 @@
-Look here!
-==========
+Project home page
 
-http://www.jboss.org/stormgrind/projects/boxgrinder/build.html
+    http://www.jboss.org/stormgrind/projects/boxgrinder/build.html
+
+Project documentation
+
+    http://community.jboss.org/docs/DOC-14358

data/bin/boxgrinder-build

@@ -26,7 +26,7 @@ require 'boxgrinder-core/helpers/log-helper'
 require 'boxgrinder-build/helpers/plugin-helper'
 require 'boxgrinder-build/appliance'
 
-gem 'boxgrinder-core', '>= 0.0.6'
+gem 'boxgrinder-core', '>= 0.0.8'
 gem 'aws-s3', '>= 0.6.2'
 gem 'amazon-ec2', '>= 0.9.6'
 gem 'net-sftp', '>= 2.0.4'
@@ -44,7 +44,9 @@ program :version, '0.3.0'
 program :description, 'A tool for building VM images from simple definition files.'
 default_command :build
 
-global_option('-V', '--verbose', TrueClass, "Prints verbose information while building. Default: false.") { ENV['BG_LOG_THRESHOLD'] = 'debug'}
+$verbose = false
+
+global_option('-V', '--verbose', TrueClass, "Prints verbose information while building. Default: false.") { $verbose = true}
 
 module BoxGrinder
   log = LogHelper.new
@@ -58,14 +60,13 @@ module BoxGrinder
     c.option '-p STRING', '--platform STRING', String, "The type of platform. Valid types are: #{PlatformPluginManager.instance.plugins.keys.join(', ')}. Default: none."
     c.option '-d STRING', '--delivery STRING', String, "The delivery type for selected image. Valid types are: #{DeliveryPluginManager.instance.types.keys.join(', ')}. Default: none."
     c.option '-f', '--force', TrueClass, "Force image creation - removes all previous builds for selected appliance. Default: false."
-    #c.option '-V', '--verbose', TrueClass, "Prints verbose information while building. Default: false."
 
     c.action do |args, options|
       options.default :platform => :none
       options.default :delivery => :none
       options.default :force    => false
-      options.default :verbose  => false
 
+      options.verbose   = $verbose
       options.platform  = options.platform.to_s.downcase.to_sym
       options.delivery  = options.delivery.to_s.downcase.to_sym
 
@@ -75,7 +76,7 @@ module BoxGrinder
       raise "Not known platform: #{options.platform}. Available platforms: #{PlatformPluginManager.instance.plugins.keys.join(', ')}." if PlatformPluginManager.instance.plugins[options.platform].nil? and options.platform != :none
       raise "Not known delivery type: #{options.delivery}. Available types: #{DeliveryPluginManager.instance.types.keys.join(', ')}." if DeliveryPluginManager.instance.types.keys.include?(options.delivery).nil?  and options.delivery != :none
 
-      Appliance.new( appliance_definition_file, :options => options, :log => log ).create
+      Appliance.new( appliance_definition_file, :options => options, :log => LogHelper.new( :threshold => $verbose ? :debug : :info ) ).create
     end
   end
 end

data/lib/boxgrinder-build/plugins/delivery/s3/aws-helper.rb

@@ -20,33 +20,27 @@
 
 require 'AWS'
 require 'aws/s3'
-require 'boxgrinder-core/defaults'
-require 'boxgrinder-build/validators/aws-validator'
 
 module BoxGrinder
   class AWSHelper
-    def initialize( config, appliance_config )
+    def initialize( config, appliance_config, plugin_config )
       @config           = config
       @appliance_config = appliance_config
-
-      aws_validator = AWSValidator.new( @config )
-      aws_validator.validate_aws_config( @config.data['aws'] )
-
-      @aws_data = @config.data['aws']
+      @plugin_config    = plugin_config
 
       # remove dashes from account number
-      @aws_data['account_number'] = @aws_data['account_number'].to_s.gsub(/-/, '')
+      @plugin_config['account_number'] = @plugin_config['account_number'].to_s.gsub(/-/, '')
 
-      @ec2        = AWS::EC2::Base.new(:access_key_id => @aws_data['access_key'], :secret_access_key => @aws_data['secret_access_key'])
-      @s3         = AWS::S3::Base.establish_connection!(:access_key_id => @aws_data['access_key'], :secret_access_key => @aws_data['secret_access_key'] )
+      @ec2        = AWS::EC2::Base.new(:access_key_id => @plugin_config['access_key'], :secret_access_key => @plugin_config['secret_access_key'])
+      @s3         = AWS::S3::Base.establish_connection!(:access_key_id => @plugin_config['access_key'], :secret_access_key => @plugin_config['secret_access_key'] )
     end
 
-    attr_reader :aws_data
+    attr_reader :plugin_config
     attr_reader :ec2
     attr_reader :s3
 
     def bucket_key( appliance_name )
-      "#{@aws_data['bucket_name']}/#{appliance_name}/#{@appliance_config.version}.#{@appliance_config.release}/#{@appliance_config.hardware.arch}"
+      "#{@plugin_config['bucket']}/#{appliance_name}/#{@appliance_config.version}.#{@appliance_config.release}/#{@appliance_config.hardware.arch}"
     end
 
     def bucket_manifest_key( appliance_name )
@@ -60,7 +54,7 @@ module BoxGrinder
     def ami_info( appliance_name )
       ami_info = nil
 
-      images = @ec2.describe_images( :owner_id => @aws_data['account_number'] ).imagesSet
+      images = @ec2.describe_images( :owner_id => @plugin_config['account_number'] ).imagesSet
 
       return nil if images.nil?
 

data/lib/boxgrinder-build/plugins/delivery/s3/s3-plugin.rb

@@ -27,6 +27,21 @@ include AWS::S3
 module BoxGrinder
   class S3Plugin < BaseDeliveryPlugin
 
+    AMI_OSES = {
+            'fedora' => ["11"]
+    }
+
+    KERNELS = {
+            'us_east' => {
+                    'fedora' => {
+                            '11' => {
+                                    'i386'     => { :aki => 'aki-a71cf9ce', :ari => 'ari-a51cf9cc' },
+                                    'x86_64'   => { :aki => 'aki-b51cf9dc', :ari => 'ari-b31cf9da' }
+                            }
+                    }
+            }
+    }
+
     def info
       {
               :name       => :s3,
@@ -37,10 +52,26 @@ module BoxGrinder
 
     def after_init
       set_default_config_value('overwrite', false)
+      set_default_config_value('path', '/')
+
+      @ami_build_dir  = "#{@appliance_config.path.dir.build}/ec2/ami"
+      @ami_manifest   = "#{@ami_build_dir}/#{@appliance_config.name}.ec2.manifest.xml"
     end
 
-    def execute(deliverables, type = :ami)
-      validate_plugin_config(['bucket', 'access_key', 'secret_access_key', 'path'])
+    def supported_os
+      supported = ""
+
+      AMI_OSES.each_key do |os_name|
+        supported << "#{os_name}, versions: #{AMI_OSES[os_name].join(", ")}"
+      end
+
+      supported
+    end
+
+    def execute( deliverables, type = :ami )
+      validate_plugin_config(['bucket', 'access_key', 'secret_access_key'])
+
+      @aws_helper = AWSHelper.new( @config, @appliance_config, @plugin_config )
 
       case type
         when :s3
@@ -48,16 +79,25 @@ module BoxGrinder
         when :cloudfront
           upload_to_bucket(deliverables, :public_read)
         when :ami
-          raise "Not implemented!"
-          #bundle_image(deliverables)
-          #upload_image
-          #register_image
+          validate_plugin_config(['cert_file', 'key_file'])
+
+          unless AMI_OSES[@appliance_config.os.name].include?(@appliance_config.os.version)
+            @log.error "You cannot convert selected image to AMI because of unsupported operating system: #{@appliance_config.os.name} #{@appliance_config.os.version}. Supported systems: #{supported_os}."
+            return
+          end
+
+          unless image_already_uploaded?
+            bundle_image( deliverables )
+            upload_image
+          else
+            @log.debug "AMI for #{@appliance_config.name} appliance already uploaded, skipping..."
+          end
+
+          register_image
       end
     end
 
     def upload_to_bucket(deliverables, permissions = :private)
-      AWSHelper.new(@config, @appliance_config)
-
       package = PackageHelper.new(@config, @appliance_config, {:log => @log, :exec_helper => @exec_helper}).package(deliverables)
 
       @log.info "Uploading #{@appliance_config.name} appliance to S3 bucket '#{@plugin_config['bucket']}'..."
@@ -81,15 +121,19 @@ module BoxGrinder
     end
 
 
-    def bundle_image(deliverables)
+    def bundle_image( deliverables )
+      return if File.exists?( @ami_build_dir )
+
       @log.info "Bundling AMI..."
 
-      @exec_helper.execute("ec2-bundle-image -i #{deliverables[:disk]} --kernel #{AWS_DEFAULTS[:kernel_id][@appliance_config.hardware.arch]} --ramdisk #{AWS_DEFAULTS[:ramdisk_id][@appliance_config.hardware.arch]} -c #{@aws_helper.aws_data['cert_file']} -k #{@aws_helper.aws_data['key_file']} -u #{@aws_helper.aws_data['account_number']} -r #{@appliance_config.hardware.arch} -d #{@appliance_config.path.dir.ec2.bundle}")
+      FileUtils.mkdir_p( @ami_build_dir )
+
+      @exec_helper.execute("ec2-bundle-image -i #{deliverables[:disk]} --kernel #{KERNELS['us_east'][@appliance_config.os.name][@appliance_config.os.version][@appliance_config.hardware.arch][:aki]} --ramdisk #{KERNELS['us_east'][@appliance_config.os.name][@appliance_config.os.version][@appliance_config.hardware.arch][:ari]} -c #{@plugin_config['cert_file']} -k #{@plugin_config['key_file']} -u #{@plugin_config['account_number']} -r #{@appliance_config.hardware.arch} -d #{@ami_build_dir}")
 
       @log.info "Bundling AMI finished."
     end
 
-    def appliance_already_uploaded?
+    def image_already_uploaded?
       begin
         bucket = Bucket.find(@aws_helper.aws_data['bucket_name'])
       rescue
@@ -107,14 +151,9 @@ module BoxGrinder
     end
 
     def upload_image
-      if appliance_already_uploaded?
-        @log.debug "Image for #{@appliance_config.name} appliance is already uploaded, skipping..."
-        return
-      end
-
-      @log.info "Uploading #{@appliance_config.name} AMI to bucket '#{@aws_helper.aws_data['bucket_name']}'..."
+      @log.info "Uploading #{@appliance_config.name} AMI to bucket '#{@plugin_config['bucket']}'..."
 
-      @exec_helper.execute("ec2-upload-bundle -b #{@aws_helper.bucket_key(@appliance_config.name)} -m #{@appliance_config.path.file.ec2.manifest} -a #{@aws_helper.aws_data['access_key']} -s #{@aws_helper.aws_data['secret_access_key']} --retry")
+      @exec_helper.execute("ec2-upload-bundle -b #{@aws_helper.bucket_key(@appliance_config.name)} -m #{@ami_manifest} -a #{@plugin_config['access_key']} -s #{@plugin_config['secret_access_key']} --retry")
     end
 
     def register_image

data/lib/boxgrinder-build/plugins/platform/ec2/ec2-plugin.rb

@@ -36,19 +36,17 @@ module BoxGrinder
     REGIONS = {'us_east' => 'url'}
 
     KERNELS = {
-            'us_east' => {
-                    'fedora' => {
-                            '11' => {
-                                    'i386'     => {:aki => 'aki-a71cf9ce', :ari => 'ari-a51cf9cc', :rpm => 'http://repo.oddthesis.org/packages/other/kernel-xen-2.6.21.7-2.fc8.i686.rpm'},
-                                    'x86_64'   => {:aki => 'aki-b51cf9dc', :ari => 'ari-b31cf9da', :rpm => 'http://repo.oddthesis.org/packages/other/kernel-xen-2.6.21.7-2.fc8.x86_64.rpm'}
-                            }
+            'fedora' => {
+                    '11' => {
+                            'i386'     => { :rpm => 'http://repo.oddthesis.org/packages/other/kernel-xen-2.6.21.7-2.fc8.i686.rpm' },
+                            'x86_64'   => { :rpm => 'http://repo.oddthesis.org/packages/other/kernel-xen-2.6.21.7-2.fc8.x86_64.rpm' }
                     }
             }
+
     }
 
     def after_init
       @deliverables[:disk] = "#{@appliance_config.path.dir.build}/ec2/#{@appliance_config.name}.ec2"
-
     end
 
     def supported_os
@@ -241,7 +239,7 @@ module BoxGrinder
               "ec2-ami-tools.noarch.rpm" => "http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools.noarch.rpm"
       }
 
-      kernel_rpm =  KERNELS['us_east'][@appliance_config.os.name][@appliance_config.os.version][@appliance_config.hardware.arch][:rpm]
+      kernel_rpm =  KERNELS[@appliance_config.os.name][@appliance_config.os.version][@appliance_config.hardware.arch][:rpm]
       rpms[File.basename(kernel_rpm)] = kernel_rpm unless kernel_rpm.nil?
 
       cache_rpms(rpms)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - BoxGrinder Project
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-10 00:00:00 +02:00
+date: 2010-05-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,8 +27,8 @@ dependencies:
         segments: 
         - 0
         - 0
-        - 6
-        version: 0.0.6
+        - 8
+        version: 0.0.8
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -176,7 +176,6 @@ files:
 - lib/boxgrinder-build/validators/ssh-validator.rb
 - lib/boxgrinder-build/validators/validator.rb
 - lib/boxgrinder-build/validators/config-validator.rb
-- lib/boxgrinder-build/validators/aws-validator.rb
 - lib/boxgrinder-build/appliance.rb
 - lib/boxgrinder-build/helpers/plugin-helper.rb
 - lib/boxgrinder-build/helpers/guestfs-helper.rb

data/lib/boxgrinder-build/validators/aws-validator.rb

@@ -1,51 +0,0 @@
-# JBoss, Home of Professional Open Source
-# Copyright 2009, Red Hat Middleware LLC, and individual contributors
-# by the @authors tag. See the copyright.txt in the distribution for a
-# full listing of individual contributors.
-#
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-#
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
-require 'boxgrinder-core/validators/errors'
-
-module BoxGrinder
-  class AWSValidator
-
-    def initialize( config )
-      @config = config
-    end
-
-    def validate_aws_config( config )
-      secure_permissions  = "600"
-
-      raise ValidationError, "Please specify aws section in configuration file (#{@config.config_file}). #{DEFAULT_HELP_TEXT[:general]}" if config.nil?
-
-      raise ValidationError, "Please specify path to cert in aws section in configuration file (#{@config.config_file}). #{DEFAULT_HELP_TEXT[:general]}" if config['cert_file'].nil?
-      raise ValidationError, "Certificate file '#{config['cert_file']}' specified in configuration file (#{@config.config_file}) doesn't exists. Please check your path. #{DEFAULT_HELP_TEXT[:general]}" unless File.exists?( config['cert_file'] )
-      cert_permission = sprintf( "%o", File.stat( config['cert_file'] ).mode )[ 3, 5 ]
-      raise ValidationError, "Certificate file '#{config['cert_file']}' specified in aws section in configuration file (#{@config.config_file}) has wrong permissions (#{cert_permission}), please correct it, run: 'chmod #{secure_permissions} #{config['cert_file']}'." unless cert_permission.eql?( secure_permissions )
-
-      raise ValidationError, "Please specify path to private key in aws section in configuration file (#{@config.config_file}). #{DEFAULT_HELP_TEXT[:general]}" if config['key_file'].nil?
-      raise ValidationError, "Private key file '#{config['key_file']}' specified in aws section in configuration file (#{@config.config_file}) doesn't exists. Please check your path." unless File.exists?( config['key_file'] )
-      key_permission = sprintf( "%o", File.stat( config['key_file'] ).mode )[ 3, 5 ]
-      raise ValidationError, "Private key file '#{config['key_file']}' specified in aws section in configuration file (#{@config.config_file}) has wrong permissions (#{key_permission}), please correct it, run: 'chmod #{secure_permissions} #{config['key_file']}'." unless key_permission.eql?( secure_permissions )
-
-      raise ValidationError, "Please specify account number in aws section in configuration file (#{@config.config_file}). #{DEFAULT_HELP_TEXT[:general]}" if config['account_number'].nil?
-      raise ValidationError, "Please specify access key in aws section in configuration file (#{@config.config_file}). #{DEFAULT_HELP_TEXT[:general]}" if config['access_key'].nil?
-      raise ValidationError, "Please specify secret access key in aws section in configuration file (#{@config.config_file}). #{DEFAULT_HELP_TEXT[:general]}" if config['secret_access_key'].nil?
-      raise ValidationError, "Please specify bucket name in in aws section in configuration file (#{@config.config_file})." if config['bucket_name'].nil? or config['bucket_name'].length == 0
-    end
-  end
-end