boxgrinder-build 0.9.4 → 0.9.5

data/CHANGELOG

@@ -1,3 +1,12 @@
+v0.9.5
+
+* [BGBUILD-294] Package aws-sdk 1.1.1 and update dependency
+* [BGBUILD-277] When delivering as AMI, the EC2 region should match S3 bucket's region (location constraint)
+* [BGBUILD-297] Cannot create EBS appliances when using overwrite parameter
+* [BGBUILD-280] Add support for GRUB2
+* [BGBUILD-279] Add support for Fedora 16
+* [BGBUILD-293] Check certificate and key paths are valid before building AMIs
+
 v0.9.4
 
 * [BGBUILD-263] NoMethodError: undefined method `item' for nil:NilClass while creating EBS appliance

data/Manifest

@@ -19,6 +19,7 @@ integ/appliances/_repos_testlocal_ephemeral_noarch.appl
 integ/appliances/_test_base.appl
 integ/appliances/gnome-fedora.appl
 integ/appliances/jeos-centos.appl
+integ/appliances/jeos-f16.appl
 integ/appliances/jeos-fedora.appl
 integ/appliances/modular.appl
 integ/packages/ephemeral-repo-test-0.1-1.noarch.rpm
@@ -90,4 +91,4 @@ spec/plugins/os/centos/centos-plugin-spec.rb
 spec/plugins/os/fedora/fedora-plugin-spec.rb
 spec/plugins/os/rhel/rhel-plugin-spec.rb
 spec/plugins/os/rpm-based/kickstart-spec.rb
-spec/plugins/os/rpm-based/rpm-based-os-plugin-spec.rb
+spec/plugins/os/rpm-ba

data/Rakefile

@@ -28,7 +28,7 @@ Echoe.new("boxgrinder-build") do |p|
   p.email = "info@boxgrinder.org"
   p.runtime_dependencies = [
       "boxgrinder-core ~>0.3.0",
-      'aws-sdk', # EBS and S3
+      'aws-sdk >=1.1.1', # EBS and S3
       'net-sftp', 'net-ssh', 'progressbar', # SFTP
       'rest-client' # ElasticHosts
   ]

data/boxgrinder-build.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{boxgrinder-build}
-  s.version = "0.9.4"
+  s.version = "0.9.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marek Goldmann"]
-  s.date = %q{2011-08-17}
+  s.date = %q{2011-08-26}
   s.default_executable = %q{boxgrinder-build}
   s.description = %q{A tool for creating appliances from simple plain text files for various virtual environments.}
   s.email = %q{info@boxgrinder.org}
   s.executables = ["boxgrinder-build"]
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.md", "bin/boxgrinder-build", "lib/boxgrinder-build.rb", "lib/boxgrinder-build/appliance.rb", "lib/boxgrinder-build/helpers/augeas-helper.rb", "lib/boxgrinder-build/helpers/aws-helper.rb", "lib/boxgrinder-build/helpers/ec2-helper.rb", "lib/boxgrinder-build/helpers/guestfs-helper.rb", "lib/boxgrinder-build/helpers/image-helper.rb", "lib/boxgrinder-build/helpers/linux-helper.rb", "lib/boxgrinder-build/helpers/package-helper.rb", "lib/boxgrinder-build/helpers/plugin-helper.rb", "lib/boxgrinder-build/helpers/qemu.wrapper", "lib/boxgrinder-build/helpers/s3-helper.rb", "lib/boxgrinder-build/managers/plugin-manager.rb", "lib/boxgrinder-build/plugins/base-plugin.rb", "lib/boxgrinder-build/plugins/delivery/ebs/ebs-plugin.rb", "lib/boxgrinder-build/plugins/delivery/elastichosts/elastichosts-plugin.rb", "lib/boxgrinder-build/plugins/delivery/local/local-plugin.rb", "lib/boxgrinder-build/plugins/delivery/s3/s3-plugin.rb", "lib/boxgrinder-build/plugins/delivery/s3/src/cert-ec2.pem", "lib/boxgrinder-build/plugins/delivery/sftp/sftp-plugin.rb", "lib/boxgrinder-build/plugins/delivery/usb/usb-plugin.rb", "lib/boxgrinder-build/plugins/os/centos/centos-plugin.rb", "lib/boxgrinder-build/plugins/os/fedora/fedora-plugin.rb", "lib/boxgrinder-build/plugins/os/rhel/rhel-plugin.rb", "lib/boxgrinder-build/plugins/os/rpm-based/kickstart.rb", "lib/boxgrinder-build/plugins/os/rpm-based/rpm-based-os-plugin.rb", "lib/boxgrinder-build/plugins/os/rpm-based/rpm-dependency-validator.rb", "lib/boxgrinder-build/plugins/os/rpm-based/src/appliance.ks.erb", "lib/boxgrinder-build/plugins/os/rpm-based/src/base.repo", "lib/boxgrinder-build/plugins/os/rpm-based/src/motd.init", "lib/boxgrinder-build/plugins/os/sl/sl-plugin.rb", "lib/boxgrinder-build/plugins/platform/ec2/ec2-plugin.rb", "lib/boxgrinder-build/plugins/platform/ec2/src/fstab_32bit", "lib/boxgrinder-build/plugins/platform/ec2/src/fstab_64bit", "lib/boxgrinder-build/plugins/platform/ec2/src/ifcfg-eth0", "lib/boxgrinder-build/plugins/platform/ec2/src/menu.lst", "lib/boxgrinder-build/plugins/platform/ec2/src/rc_local", "lib/boxgrinder-build/plugins/platform/virtualbox/virtualbox-plugin.rb", "lib/boxgrinder-build/plugins/platform/vmware/src/README-enterprise", "lib/boxgrinder-build/plugins/platform/vmware/src/README-personal", "lib/boxgrinder-build/plugins/platform/vmware/src/base.vmdk", "lib/boxgrinder-build/plugins/platform/vmware/src/base.vmx", "lib/boxgrinder-build/plugins/platform/vmware/vmware-plugin.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README.md", "Rakefile", "bin/boxgrinder-build", "boxgrinder-build.gemspec", "integ/appliances/_hardware_cpus.appl", "integ/appliances/_hardware_memory.appl", "integ/appliances/_hardware_partitions_home.appl", "integ/appliances/_hardware_partitions_root.appl", "integ/appliances/_os_password.appl", "integ/appliances/_packages_groups_base.appl", "integ/appliances/_packages_groups_core.appl", "integ/appliances/_packages_squid.appl", "integ/appliances/_packages_utils.appl", "integ/appliances/_repos_boxgrinder_permanent_noarch.appl", "integ/appliances/_repos_testlocal_ephemeral_noarch.appl", "integ/appliances/_test_base.appl", "integ/appliances/gnome-fedora.appl", "integ/appliances/jeos-centos.appl", "integ/appliances/jeos-fedora.appl", "integ/appliances/modular.appl", "integ/packages/ephemeral-repo-test-0.1-1.noarch.rpm", "integ/packages/local-repo-test.spec", "integ/spec/jeos-spec.rb", "integ/spec/modular-spec.rb", "lib/boxgrinder-build.rb", "lib/boxgrinder-build/appliance.rb", "lib/boxgrinder-build/helpers/augeas-helper.rb", "lib/boxgrinder-build/helpers/aws-helper.rb", "lib/boxgrinder-build/helpers/ec2-helper.rb", "lib/boxgrinder-build/helpers/guestfs-helper.rb", "lib/boxgrinder-build/helpers/image-helper.rb", "lib/boxgrinder-build/helpers/linux-helper.rb", "lib/boxgrinder-build/helpers/package-helper.rb", "lib/boxgrinder-build/helpers/plugin-helper.rb", "lib/boxgrinder-build/helpers/qemu.wrapper", "lib/boxgrinder-build/helpers/s3-helper.rb", "lib/boxgrinder-build/managers/plugin-manager.rb", "lib/boxgrinder-build/plugins/base-plugin.rb", "lib/boxgrinder-build/plugins/delivery/ebs/ebs-plugin.rb", "lib/boxgrinder-build/plugins/delivery/elastichosts/elastichosts-plugin.rb", "lib/boxgrinder-build/plugins/delivery/local/local-plugin.rb", "lib/boxgrinder-build/plugins/delivery/s3/s3-plugin.rb", "lib/boxgrinder-build/plugins/delivery/s3/src/cert-ec2.pem", "lib/boxgrinder-build/plugins/delivery/sftp/sftp-plugin.rb", "lib/boxgrinder-build/plugins/delivery/usb/usb-plugin.rb", "lib/boxgrinder-build/plugins/os/centos/centos-plugin.rb", "lib/boxgrinder-build/plugins/os/fedora/fedora-plugin.rb", "lib/boxgrinder-build/plugins/os/rhel/rhel-plugin.rb", "lib/boxgrinder-build/plugins/os/rpm-based/kickstart.rb", "lib/boxgrinder-build/plugins/os/rpm-based/rpm-based-os-plugin.rb", "lib/boxgrinder-build/plugins/os/rpm-based/rpm-dependency-validator.rb", "lib/boxgrinder-build/plugins/os/rpm-based/src/appliance.ks.erb", "lib/boxgrinder-build/plugins/os/rpm-based/src/base.repo", "lib/boxgrinder-build/plugins/os/rpm-based/src/motd.init", "lib/boxgrinder-build/plugins/os/sl/sl-plugin.rb", "lib/boxgrinder-build/plugins/platform/ec2/ec2-plugin.rb", "lib/boxgrinder-build/plugins/platform/ec2/src/fstab_32bit", "lib/boxgrinder-build/plugins/platform/ec2/src/fstab_64bit", "lib/boxgrinder-build/plugins/platform/ec2/src/ifcfg-eth0", "lib/boxgrinder-build/plugins/platform/ec2/src/menu.lst", "lib/boxgrinder-build/plugins/platform/ec2/src/rc_local", "lib/boxgrinder-build/plugins/platform/virtualbox/virtualbox-plugin.rb", "lib/boxgrinder-build/plugins/platform/vmware/src/README-enterprise", "lib/boxgrinder-build/plugins/platform/vmware/src/README-personal", "lib/boxgrinder-build/plugins/platform/vmware/src/base.vmdk", "lib/boxgrinder-build/plugins/platform/vmware/src/base.vmx", "lib/boxgrinder-build/plugins/platform/vmware/vmware-plugin.rb", "rubygem-boxgrinder-build.spec", "spec/appliance-spec.rb", "spec/helpers/augeas-helper-spec.rb", "spec/helpers/ec2-helper-spec.rb", "spec/helpers/guestfs-helper-spec.rb", "spec/helpers/image-helper-spec.rb", "spec/helpers/linux-helper-spec.rb", "spec/helpers/package-helper-spec.rb", "spec/helpers/plugin-helper-spec.rb", "spec/helpers/s3-helper-spec.rb", "spec/managers/plugin-manager-spec.rb", "spec/plugins/base-plugin-spec.rb", "spec/plugins/delivery/ebs/ebs-plugin-spec.rb", "spec/plugins/delivery/ebs/ebs.yaml", "spec/plugins/delivery/elastichosts/elastichosts-plugin-spec.rb", "spec/plugins/delivery/local/local-plugin-spec.rb", "spec/plugins/delivery/s3/s3-plugin-spec.rb", "spec/plugins/delivery/sftp/sftp-plugin-spec.rb", "spec/plugins/os/centos/centos-plugin-spec.rb", "spec/plugins/os/fedora/fedora-plugin-spec.rb", "spec/plugins/os/rhel/rhel-plugin-spec.rb", "spec/plugins/os/rpm-based/kickstart-spec.rb", "spec/plugins/os/rpm-based/rpm-based-os-plugin-spec.rb", "spec/plugins/os/rpm-based/rpm-dependency-validator-spec.rb", "spec/plugins/os/rpm-based/src/jeos-f13-plain.ks", "spec/plugins/os/rpm-based/src/jeos-f13-without-version.ks", "spec/plugins/os/rpm-based/src/jeos-f13.ks", "spec/plugins/os/sl/sl-plugin-spec.rb", "spec/plugins/platform/ec2/ec2-plugin-spec.rb", "spec/plugins/platform/virtualbox/virtualbox-plugin-spec.rb", "spec/plugins/platform/vmware/vmware-plugin-spec.rb"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README.md", "Rakefile", "bin/boxgrinder-build", "boxgrinder-build.gemspec", "integ/appliances/_hardware_cpus.appl", "integ/appliances/_hardware_memory.appl", "integ/appliances/_hardware_partitions_home.appl", "integ/appliances/_hardware_partitions_root.appl", "integ/appliances/_os_password.appl", "integ/appliances/_packages_groups_base.appl", "integ/appliances/_packages_groups_core.appl", "integ/appliances/_packages_squid.appl", "integ/appliances/_packages_utils.appl", "integ/appliances/_repos_boxgrinder_permanent_noarch.appl", "integ/appliances/_repos_testlocal_ephemeral_noarch.appl", "integ/appliances/_test_base.appl", "integ/appliances/gnome-fedora.appl", "integ/appliances/jeos-centos.appl", "integ/appliances/jeos-f16.appl", "integ/appliances/jeos-fedora.appl", "integ/appliances/modular.appl", "integ/packages/ephemeral-repo-test-0.1-1.noarch.rpm", "integ/packages/local-repo-test.spec", "integ/spec/jeos-spec.rb", "integ/spec/modular-spec.rb", "lib/boxgrinder-build.rb", "lib/boxgrinder-build/appliance.rb", "lib/boxgrinder-build/helpers/augeas-helper.rb", "lib/boxgrinder-build/helpers/aws-helper.rb", "lib/boxgrinder-build/helpers/ec2-helper.rb", "lib/boxgrinder-build/helpers/guestfs-helper.rb", "lib/boxgrinder-build/helpers/image-helper.rb", "lib/boxgrinder-build/helpers/linux-helper.rb", "lib/boxgrinder-build/helpers/package-helper.rb", "lib/boxgrinder-build/helpers/plugin-helper.rb", "lib/boxgrinder-build/helpers/qemu.wrapper", "lib/boxgrinder-build/helpers/s3-helper.rb", "lib/boxgrinder-build/managers/plugin-manager.rb", "lib/boxgrinder-build/plugins/base-plugin.rb", "lib/boxgrinder-build/plugins/delivery/ebs/ebs-plugin.rb", "lib/boxgrinder-build/plugins/delivery/elastichosts/elastichosts-plugin.rb", "lib/boxgrinder-build/plugins/delivery/local/local-plugin.rb", "lib/boxgrinder-build/plugins/delivery/s3/s3-plugin.rb", "lib/boxgrinder-build/plugins/delivery/s3/src/cert-ec2.pem", "lib/boxgrinder-build/plugins/delivery/sftp/sftp-plugin.rb", "lib/boxgrinder-build/plugins/delivery/usb/usb-plugin.rb", "lib/boxgrinder-build/plugins/os/centos/centos-plugin.rb", "lib/boxgrinder-build/plugins/os/fedora/fedora-plugin.rb", "lib/boxgrinder-build/plugins/os/rhel/rhel-plugin.rb", "lib/boxgrinder-build/plugins/os/rpm-based/kickstart.rb", "lib/boxgrinder-build/plugins/os/rpm-based/rpm-based-os-plugin.rb", "lib/boxgrinder-build/plugins/os/rpm-based/rpm-dependency-validator.rb", "lib/boxgrinder-build/plugins/os/rpm-based/src/appliance.ks.erb", "lib/boxgrinder-build/plugins/os/rpm-based/src/base.repo", "lib/boxgrinder-build/plugins/os/rpm-based/src/motd.init", "lib/boxgrinder-build/plugins/os/sl/sl-plugin.rb", "lib/boxgrinder-build/plugins/platform/ec2/ec2-plugin.rb", "lib/boxgrinder-build/plugins/platform/ec2/src/fstab_32bit", "lib/boxgrinder-build/plugins/platform/ec2/src/fstab_64bit", "lib/boxgrinder-build/plugins/platform/ec2/src/ifcfg-eth0", "lib/boxgrinder-build/plugins/platform/ec2/src/menu.lst", "lib/boxgrinder-build/plugins/platform/ec2/src/rc_local", "lib/boxgrinder-build/plugins/platform/virtualbox/virtualbox-plugin.rb", "lib/boxgrinder-build/plugins/platform/vmware/src/README-enterprise", "lib/boxgrinder-build/plugins/platform/vmware/src/README-personal", "lib/boxgrinder-build/plugins/platform/vmware/src/base.vmdk", "lib/boxgrinder-build/plugins/platform/vmware/src/base.vmx", "lib/boxgrinder-build/plugins/platform/vmware/vmware-plugin.rb", "rubygem-boxgrinder-build.spec", "spec/appliance-spec.rb", "spec/helpers/augeas-helper-spec.rb", "spec/helpers/ec2-helper-spec.rb", "spec/helpers/guestfs-helper-spec.rb", "spec/helpers/image-helper-spec.rb", "spec/helpers/linux-helper-spec.rb", "spec/helpers/package-helper-spec.rb", "spec/helpers/plugin-helper-spec.rb", "spec/helpers/s3-helper-spec.rb", "spec/managers/plugin-manager-spec.rb", "spec/plugins/base-plugin-spec.rb", "spec/plugins/delivery/ebs/ebs-plugin-spec.rb", "spec/plugins/delivery/ebs/ebs.yaml", "spec/plugins/delivery/elastichosts/elastichosts-plugin-spec.rb", "spec/plugins/delivery/local/local-plugin-spec.rb", "spec/plugins/delivery/s3/s3-plugin-spec.rb", "spec/plugins/delivery/sftp/sftp-plugin-spec.rb", "spec/plugins/os/centos/centos-plugin-spec.rb", "spec/plugins/os/fedora/fedora-plugin-spec.rb", "spec/plugins/os/rhel/rhel-plugin-spec.rb", "spec/plugins/os/rpm-based/kickstart-spec.rb", "spec/plugins/os/rpm-based/rpm-based-os-plugin-spec.rb", "spec/plugins/os/rpm-based/rpm-dependency-validator-spec.rb", "spec/plugins/os/rpm-based/src/jeos-f13-plain.ks", "spec/plugins/os/rpm-based/src/jeos-f13-without-version.ks", "spec/plugins/os/rpm-based/src/jeos-f13.ks", "spec/plugins/os/sl/sl-plugin-spec.rb", "spec/plugins/platform/ec2/ec2-plugin-spec.rb", "spec/plugins/platform/virtualbox/virtualbox-plugin-spec.rb", "spec/plugins/platform/vmware/vmware-plugin-spec.rb"]
   s.homepage = %q{http://boxgrinder.org/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Boxgrinder-build", "--main", "README.md"]
   s.require_paths = ["lib"]
@@ -26,14 +26,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<boxgrinder-core>, ["~> 0.3.0"])
-      s.add_runtime_dependency(%q<aws-sdk>, [">= 0"])
+      s.add_runtime_dependency(%q<aws-sdk>, [">= 1.1.1"])
       s.add_runtime_dependency(%q<net-sftp>, [">= 0"])
       s.add_runtime_dependency(%q<net-ssh>, [">= 0"])
       s.add_runtime_dependency(%q<progressbar>, [">= 0"])
       s.add_runtime_dependency(%q<rest-client>, [">= 0"])
     else
       s.add_dependency(%q<boxgrinder-core>, ["~> 0.3.0"])
-      s.add_dependency(%q<aws-sdk>, [">= 0"])
+      s.add_dependency(%q<aws-sdk>, [">= 1.1.1"])
       s.add_dependency(%q<net-sftp>, [">= 0"])
       s.add_dependency(%q<net-ssh>, [">= 0"])
       s.add_dependency(%q<progressbar>, [">= 0"])
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<boxgrinder-core>, ["~> 0.3.0"])
-    s.add_dependency(%q<aws-sdk>, [">= 0"])
+    s.add_dependency(%q<aws-sdk>, [">= 1.1.1"])
     s.add_dependency(%q<net-sftp>, [">= 0"])
     s.add_dependency(%q<net-ssh>, [">= 0"])
     s.add_dependency(%q<progressbar>, [">= 0"])

data/integ/appliances/jeos-f16.appl

@@ -0,0 +1,9 @@
+name: jeos-f16
+os:
+  name: fedora
+  version: 16
+repos:
+  - name: "temp-fedora-updates-testing"
+    mirrorlist: "https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f#OS_VERSION#&arch=#BASE_ARCH#"
+    ephemeral: true
+

data/integ/spec/jeos-spec.rb

@@ -53,6 +53,11 @@ module BoxGrinder
         @appliance = Appliance.new("#{File.dirname(__FILE__)}/../appliances/jeos-fedora.appl", @config, :log => @log).create
       end
 
+      it "should build Fedora 16 JEOS and create an AMI" do
+        @config.merge!(:platform => :ec2, :delivery => :ami)
+        @appliance = Appliance.new("#{File.dirname(__FILE__)}/../appliances/jeos-f16.appl", @config, :log => @log).create
+      end
+
       it "should build CentOS JEOS" do
         @appliance = Appliance.new("#{File.dirname(__FILE__)}/../appliances/jeos-centos.appl", @config, :log => @log).create
       end

data/lib/boxgrinder-build/helpers/ec2-helper.rb

@@ -171,7 +171,7 @@ module BoxGrinder
 
           'us-east-1' => {
             :endpoint => 'ec2.amazonaws.com',
-            :location => '',
+            :location => nil,
             :kernel => {
               :i386 => {:aki => 'aki-407d9529'},
               :x86_64 => {:aki => 'aki-427d952b'}

data/lib/boxgrinder-build/helpers/s3-helper.rb

@@ -32,7 +32,7 @@ module BoxGrinder
     end
 
     def bucket(options={})
-      defaults = {:bucket => nil, :acl => :private, :location_constraint => 'us-east-1', :create_if_missing => false}.merge!(options)
+      defaults = {:bucket => nil, :acl => :private, :location_constraint => 'us-east-1', :create_if_missing => false}
       options = parse_opts(options, defaults)
 
       s3b = @s3.buckets[options[:bucket]]
@@ -43,11 +43,6 @@ module BoxGrinder
       nil
     end
 
-    #aws-sdk 1.0.3 added .exists?
-    def object_exists?(s3_object)
-      s3_object.exists?
-    end
-
     def delete_folder(bucket, path)
       bucket.objects.with_prefix(deslash(path)).map(&:delete)
     end
@@ -112,7 +107,7 @@ module BoxGrinder
 
       'us-east-1' => {
         :endpoint => 's3.amazonaws.com',
-        :location => '',
+        :location => nil,
         :kernel => {
           :i386 => {:aki => 'aki-407d9529'},
           :x86_64 => {:aki => 'aki-427d952b'}

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

@@ -74,7 +74,7 @@ module BoxGrinder
       ebs_appliance_description = "#{@appliance_config.summary} | Appliance version #{@appliance_config.version}.#{@appliance_config.release} | #{@appliance_config.hardware.arch} architecture"
 
       @log.debug "Checking if appliance is already registered..."
-      ami = @ec2helper.ami_by_name(ebs_appliance_name)
+      ami = ami_by_name(ebs_appliance_name)
 
       if ami and @plugin_config['overwrite']
         @log.info "Overwrite is enabled. Stomping existing assets."
@@ -172,8 +172,6 @@ module BoxGrinder
       @ec2helper.ami_by_name(name, @plugin_config['account_number'])
     end
 
-    alias :already_registered? :ami_by_name
-
     def terminate_instances(instances)
       instances.map(&:terminate)
       instances.each do |i|
@@ -213,7 +211,7 @@ module BoxGrinder
 
       snapshot = 1
 
-      while @ec2helper.already_registered?("#{base_path}-SNAPSHOT-#{snapshot}/#{@appliance_config.hardware.arch}")
+      while ami_by_name("#{base_path}-SNAPSHOT-#{snapshot}/#{@appliance_config.hardware.arch}")
         snapshot += 1
       end
       # Reuse the last key (if there was one)
@@ -260,4 +258,4 @@ module BoxGrinder
   end
 end
 
-plugin :class => BoxGrinder::EBSPlugin, :type => :delivery, :name => :ebs, :full_name => "Elastic Block Storage"
+plugin :class => BoxGrinder::EBSPlugin, :type => :delivery, :name => :ebs, :full_name => "Elastic Block Storage"

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

@@ -27,7 +27,7 @@ module BoxGrinder
   class S3Plugin < BasePlugin
 
     def after_init
-      register_supported_os("fedora", ['13', '14', '15'])
+      register_supported_os("fedora", ['13', '14', '15', '16'])
       register_supported_os("centos", ['5'])
       register_supported_os("rhel", ['5', '6'])
       register_supported_os("sl", ['5', '6'])
@@ -45,10 +45,13 @@ module BoxGrinder
       subtype(:ami) do
         set_default_config_value('snapshot', false)
         validate_plugin_config(['cert_file', 'key_file', 'account_number'], 'http://boxgrinder.org/tutorials/boxgrinder-build-plugins/#S3_Delivery_Plugin')
+
+        raise PluginValidationError, "AWS certificate file doesn't exists, please check the path: '#{@plugin_config['cert_file']}'." unless File.exists?(File.expand_path(@plugin_config['cert_file']))
+        raise PluginValidationError, "AWS key file doesn't exists, please check the path: '#{@plugin_config['key_file']}'." unless File.exists?(File.expand_path(@plugin_config['key_file']))
       end
 
       @s3_endpoints = S3Helper::endpoints
-      raise PluginValidationError, "Invalid region specified: #{@plugin_config['region']}. This plugin is only aware of the following regions: #{@s3_endpoints.keys.join(", ")}" unless @s3_endpoints.has_key?(@plugin_config['region'])
+      raise PluginValidationError, "Invalid region specified: #{@plugin_config['region']}. This plugin is only aware of the following regions: #{@s3_endpoints.keys.join(", ")}." unless @s3_endpoints.has_key?(@plugin_config['region'])
 
       @plugin_config['account_number'] = @plugin_config['account_number'].to_s.gsub(/-/, '')
 
@@ -59,12 +62,21 @@ module BoxGrinder
         :s3_endpoint => @s3_endpoints[@plugin_config['region']][:endpoint],
         :max_retries => 5,
         :use_ssl => @plugin_config['use_ssl'])
-        #:logger => @log)   need to  modify our logger to accept blah.log(:level, 'message')
 
       @ec2 = AWS::EC2.new
       @s3 = AWS::S3.new
       @s3helper = S3Helper.new(@ec2, @s3, :log => @log)
       @ec2helper = EC2Helper.new(@ec2, :log => @log)
+
+      subtype(:ami) do
+        # If there is an existing bucket, determine whether its location_constraint matches the region selected
+        if existing_bucket = asset_bucket(false)
+          raise PluginValidationError, "Existing bucket #{@plugin_config['bucket']} has a location constraint that does not match the region selected. " <<
+          "AMI region and bucket location constraint must match." unless constraint_equal?(@s3_endpoints[@plugin_config['region']][:location], existing_bucket.location_constraint)
+        end
+      end
+
+      @bucket = asset_bucket(true)
     end
 
     def execute
@@ -75,34 +87,25 @@ module BoxGrinder
           upload_to_bucket(@previous_deliverables, :public_read)
         when :ami
           ami_dir = ami_key(@appliance_config.name, @plugin_config['path'])
-          ami_manifest_key = @s3helper.stub_s3obj(asset_bucket, "#{ami_dir}/#{@appliance_config.name}.ec2.manifest.xml")
+          ami_manifest_key = @s3helper.stub_s3obj(@bucket, "#{ami_dir}/#{@appliance_config.name}.ec2.manifest.xml")
 
           @log.debug "Going to check whether s3 object exists"
 
-          if @s3helper.object_exists?(ami_manifest_key) and @plugin_config['overwrite']
+          if ami_manifest_key.exists? and @plugin_config['overwrite']
             @log.info "Object exists, attempting to deregister an existing image"
             deregister_image(ami_manifest_key) # Remove existing image
-            @s3helper.delete_folder(asset_bucket, ami_dir) # Avoid triggering dupe detection
+            @s3helper.delete_folder(@bucket, ami_dir) # Avoid triggering dupe detection
           end
 
-          if !@s3helper.object_exists?(ami_manifest_key) or @plugin_config['snapshot']
+          if !ami_manifest_key.exists? or @plugin_config['snapshot']
             @log.info "Doing bundle/snapshot"
             bundle_image(@previous_deliverables)
-            fix_sha1_sum
             upload_image(ami_dir)
           end
           register_image(ami_manifest_key)
       end
     end
 
-    # https://jira.jboss.org/browse/BGBUILD-34
-    def fix_sha1_sum
-      ami_manifest = File.open(@ami_manifest).read
-      ami_manifest.gsub!('(stdin)= ', '')
-
-      File.open(@ami_manifest, "w") { |f| f.write(ami_manifest) }
-    end
-
     def upload_to_bucket(previous_deliverables, permissions = :private)
       register_deliverable(
           :package => "#{@appliance_config.name}-#{@appliance_config.version}.#{@appliance_config.release}-#{@appliance_config.os.name}-#{@appliance_config.os.version}-#{@appliance_config.hardware.arch}-#{current_platform}.tgz"
@@ -115,9 +118,9 @@ module BoxGrinder
 
       remote_path = "#{@s3helper.parse_path(@plugin_config['path'])}#{File.basename(@deliverables[:package])}"
       size_m = File.size(@deliverables[:package])/1024**2
-      s3_obj = @s3helper.stub_s3obj(asset_bucket,remote_path.gsub(/^\//, '').gsub(/\/\//, ''))
+      s3_obj = @s3helper.stub_s3obj(@bucket,remote_path.gsub(/^\//, '').gsub(/\/\//, ''))
       # Does it really exist?
-      obj_exists = @s3helper.object_exists?(s3_obj)
+      obj_exists = s3_obj.exists?
 
       if !obj_exists or @plugin_config['overwrite']
         @log.info "Will overwrite existing file #{remote_path}" if obj_exists and @plugin_config['overwrite']
@@ -132,8 +135,8 @@ module BoxGrinder
 
     def asset_bucket(create_if_missing = true, permissions = :private)
       @s3helper.bucket(:bucket => @plugin_config['bucket'],
+        :create_if_missing => create_if_missing,
         :acl => permissions,
-        :create_of_missing => create_if_missing,
         :location_constraint => @s3_endpoints[@plugin_config['region']][:location]
       )
     end
@@ -156,7 +159,6 @@ module BoxGrinder
     end
 
     def upload_image(ami_dir)
-      asset_bucket(true,:private) # this will create the bucket if needed
       @log.info "Uploading #{@appliance_config.name} AMI to bucket '#{@plugin_config['bucket']}'..."
 
       @exec_helper.execute("euca-upload-bundle -U #{@plugin_config['url'].nil? ? "http://#{@s3_endpoints[@plugin_config['region']][:endpoint]}" : @plugin_config['url']} -b #{@plugin_config['bucket']}/#{ami_dir} -m #{@ami_manifest} -a #{@plugin_config['access_key']} -s #{@plugin_config['secret_access_key']}", :redacted => [@plugin_config['access_key'], @plugin_config['secret_access_key']])
@@ -196,9 +198,7 @@ module BoxGrinder
 
       @log.info "Determining snapshot name"
       snapshot = 1
-      while @s3helper.object_exists?(
-          @s3helper.stub_s3obj(asset_bucket, "#{base_path}-SNAPSHOT-#{snapshot}/#{@appliance_config.hardware.arch}/")
-      )
+      while @s3helper.stub_s3obj(@bucket, "#{base_path}-SNAPSHOT-#{snapshot}/#{@appliance_config.hardware.arch}/").exists?
         snapshot += 1
       end
       # Reuse the last key (if there was one)
@@ -207,6 +207,12 @@ module BoxGrinder
       "#{base_path}-SNAPSHOT-#{snapshot}/#{@appliance_config.hardware.arch}"
     end
 
+    #US constraint is often represented as '' or nil
+    def constraint_equal?(a, b)
+      [a, b].collect!{|c| c.nil? ? '': c}
+      a == b
+    end
+
   end
 end
 

data/lib/boxgrinder-build/plugins/os/fedora/fedora-plugin.rb

@@ -22,7 +22,7 @@ module BoxGrinder
   class FedoraPlugin < RPMBasedOSPlugin
     def after_init
       super
-      register_supported_os('fedora', ["13", "14", "15", "rawhide"])
+      register_supported_os('fedora', ["13", "14", "15", "16", "rawhide"])
       set_default_config_value('PAE',true)
     end
 
@@ -42,7 +42,16 @@ module BoxGrinder
         end
       end
 
-      build_with_appliance_creator(appliance_definition_file, @repos)
+      build_with_appliance_creator(appliance_definition_file, @repos) do |guestfs, guestfs_helper|
+        if @appliance_config.os.version >= "15"
+          disable_biosdevname(guestfs)
+          change_runlevel(guestfs)
+          disable_netfs(guestfs)
+          link_mtab(guestfs)
+        end
+
+        switch_to_grub2(guestfs, guestfs_helper) if @appliance_config.os.version >= "16"
+      end
     end
 
     def normalize_packages(packages)
@@ -60,7 +69,49 @@ module BoxGrinder
         @plugin_config['PAE'] ? packages << "kernel-PAE" : packages << "kernel"
       end
     end
+
+    # Since Fedora 16 by default GRUB2 is used - we remove Legacy GRUB
+    # and use GRUB2 instead
+    #
+    # https://issues.jboss.org/browse/BGBUILD-280
+    def switch_to_grub2(guestfs, guestfs_helper)
+      @log.debug "Switching to GRUB2..."
+      guestfs_helper.sh("yum -y remove grub")
+      # We are using only one disk, so this is save
+      guestfs.sh("cd / && grub2-install --force #{guestfs.list_devices.first}")
+      guestfs.sh("cd / && grub2-mkconfig -o /boot/grub2/grub.cfg")
+      @log.debug "Using GRUB2 from now."
+    end
+
+    def disable_biosdevname(guestfs)
+      @log.debug "Disabling biosdevname..."
+      guestfs.write("/etc/default/grub", "GRUB_CMDLINE_LINUX=\"quiet rhgb biosdevname=0\"\n") if guestfs.exists("/boot/grub2/grub.cfg") != 0
+      guestfs.sh('sed -i "s/kernel\(.*\)/kernel\1 biosdevname=0/g" /boot/grub/grub.conf') if guestfs.exists("/boot/grub/grub.cfg") != 0
+      @log.debug "Biosdevname disabled."
+    end
+
+    # https://issues.jboss.org/browse/BGBUILD-204
+    def change_runlevel(guestfs)
+      @log.debug "Changing runlevel to multi-user non-graphical..."
+      guestfs.rm("/etc/systemd/system/default.target")
+      guestfs.ln_sf("/lib/systemd/system/multi-user.target", "/etc/systemd/system/default.target")
+      @log.debug "Runlevel changed."
+    end
+
+    # https://issues.jboss.org/browse/BGBUILD-204
+    def disable_netfs(guestfs)
+      @log.debug "Disabling network filesystem mounting..."
+      guestfs.sh("chkconfig netfs off")
+      @log.debug "Network filesystem mounting disabled."
+    end
+    
+    # https://issues.jboss.org/browse/BGBUILD-209
+    def link_mtab(guestfs)
+      @log.debug "Linking /etc/mtab to /proc/self/mounts..."
+      guestfs.ln_sf("/proc/self/mounts", "/etc/mtab")
+      @log.debug "/etc/mtab linked."
+    end
   end
 end
 
-plugin :class => BoxGrinder::FedoraPlugin, :type => :os, :name => :fedora, :full_name => "Fedora", :versions => ["13", "14", "15", "rawhide"]
+plugin :class => BoxGrinder::FedoraPlugin, :type => :os, :name => :fedora, :full_name => "Fedora", :versions => ["13", "14", "15", "16", "rawhide"]

data/lib/boxgrinder-build/plugins/os/rpm-based/rpm-based-os-plugin.rb

@@ -142,13 +142,6 @@ module BoxGrinder
         set_motd(guestfs)
         install_repos(guestfs)
 
-        if @appliance_config.os.name == 'fedora' and @appliance_config.os.version == '15'
-          disable_biosdevname(guestfs)
-          change_runlevel(guestfs)
-          disable_netfs(guestfs)
-          link_mtab(guestfs)
-        end
-
         guestfs.sh("chkconfig firstboot off") if guestfs.exists('/etc/init.d/firstboot') != 0
 
         # https://issues.jboss.org/browse/BGBUILD-148
@@ -183,35 +176,6 @@ module BoxGrinder
       end
     end
 
-    # https://issues.jboss.org/browse/BGBUILD-204
-    def disable_biosdevname(guestfs)
-      @log.debug "Disabling biosdevname for Fedora 15..."
-      guestfs.sh('sed -i "s/kernel\(.*\)/kernel\1 biosdevname=0/g" /boot/grub/grub.conf')
-      @log.debug "Biosdevname disabled."
-    end
-
-    # https://issues.jboss.org/browse/BGBUILD-204
-    def change_runlevel(guestfs)
-      @log.debug "Changing runlevel to multi-user non-graphical..."
-      guestfs.rm("/etc/systemd/system/default.target")
-      guestfs.ln_sf("/lib/systemd/system/multi-user.target", "/etc/systemd/system/default.target")
-      @log.debug "Runlevel changed."
-    end
-
-    # https://issues.jboss.org/browse/BGBUILD-204
-    def disable_netfs(guestfs)
-      @log.debug "Disabling network filesystem mounting..."
-      guestfs.sh("chkconfig netfs off")
-      @log.debug "Network filesystem mounting disabled."
-    end
-
-    # https://issues.jboss.org/browse/BGBUILD-209
-    def link_mtab(guestfs)
-      @log.debug "Linking /etc/mtab to /proc/self/mounts for Fedora 15..."
-      guestfs.ln_sf("/proc/self/mounts", "/etc/mtab")
-      @log.debug "/etc/mtab linked."
-    end
-
     # https://issues.jboss.org/browse/BGBUILD-148
     def recreate_rpm_database(guestfs, guestfs_helper)
       @log.debug "Recreating RPM database..."

data/lib/boxgrinder-build/plugins/os/rpm-based/src/motd.init

@@ -6,7 +6,8 @@
 # description: Prepares /etc/motd file
 #
 ### BEGIN INIT INFO
-# Provides: ec2
+# Provides: motd
+# Required-Start: network
 # Default-Start: 2345
 # Default-Stop: 0 1 6
 # Short-Description: Prepares /etc/motd file
@@ -14,7 +15,7 @@
 ### END INIT INFO
 
 HOSTNAME=`/bin/uname -a | awk '{print $2}'`
-IP_ADDRESS=`ip addr list eth0 | grep "inet " | cut -d' ' -f6 | cut -d/ -f1`
+IP_ADDRESS=`ip addr list eth0 | grep "inet " | cut -d' ' -f6 | cut -d/ -f1 | head -1`
 
 echo -e "\nAppliance:\t#APPLIANCE# #VERSION#\nHostname:\t$HOSTNAME\nIP Address:\t$IP_ADDRESS\n" > /etc/motd
 

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

@@ -25,7 +25,7 @@ module BoxGrinder
     def after_init
       register_deliverable(:disk => "#{@appliance_config.name}.ec2")
 
-      register_supported_os('fedora', ['13', '14', '15'])
+      register_supported_os('fedora', ['13', '14', '15', '16'])
       register_supported_os('centos', ['5'])
       register_supported_os('sl', ['5', '6'])
       register_supported_os('rhel', ['5', '6'])
@@ -173,6 +173,13 @@ module BoxGrinder
       guestfs.upload(rc_local.path, "/etc/rc.local")
 
       rc_local.close
+
+      # We need to make sure that network is available when executing rc.local
+      if (@appliance_config.os.name == 'fedora' and @appliance_config.os.version >= '16')
+        guestfs.cp("/lib/systemd/system/rc-local.service", "/etc/systemd/system/")
+        guestfs.sh("sed -i '/^ConditionFileIsExecutable/a After=network.target' /etc/systemd/system/rc-local.service")
+      end
+
       @log.debug "'/etc/rc.local' file uploaded."
     end
 

data/rubygem-boxgrinder-build.spec

@@ -5,7 +5,7 @@
 
 Summary: A tool for creating appliances from simple plain text files
 Name: rubygem-%{gemname}
-Version: 0.9.4
+Version: 0.9.5
 Release: 1%{?dist}
 Group: Development/Languages
 License: LGPLv3+
@@ -29,9 +29,9 @@ BuildRequires: rubygem(rspec-core)
 
 # AWS
 Requires: euca2ools >= 1.3.1-4
-Requires: rubygem(aws-sdk) >= 1.0.4
+Requires: rubygem(aws-sdk) >= 1.1.1
 
-BuildRequires: rubygem(aws-sdk) >= 1.0.4
+BuildRequires: rubygem(aws-sdk) >= 1.1.1
 
 # SFTP
 Requires: rubygem(net-sftp)
@@ -130,6 +130,14 @@ popd
 %{gemdir}/doc/%{gemname}-%{version}
 
 %changelog
+* Thu Aug 23 2011 Marek Goldmann <mgoldman@redhat.com> - 0.9.5-1
+- Upstream release: 0.9.
+- [BGBUILD-294] Package aws-sdk 1.1.1 and update dependency
+- [BGBUILD-277] When delivering as AMI, the EC2 region should match S3 bucket's region (location constraint)
+- [BGBUILD-297] Cannot create EBS appliances when using overwrite parameter
+- [BGBUILD-280] Add support for GRUB2
+- [BGBUILD-279] Add support for Fedora 16
+- [BGBUILD-293] Check certificate and key paths are valid before building AMIs
 
 * Fri Aug 12 2011 Marc Savy <msavy@redhat.com> - 0.9.4-1
 - Upstream release: 0.9.4

data/spec/helpers/ec2-helper-spec.rb

@@ -30,7 +30,7 @@ module BoxGrinder
       AWS.stub!
       AWS.config({:access_key_id => '', :secret_access_key => ''})
       @ec2 = AWS::EC2.new()
-      @ec2helper = EC2Helper.new(@ec2)
+      @ec2helper = EC2Helper.new(@ec2, :log => LogHelper.new(:level => :trace, :type => :stdout))
       @ami = mock(AWS::EC2::Image)
       @instance = mock(AWS::EC2::Instance)
       @snapshot = mock(AWS::EC2::Snapshot)
@@ -257,4 +257,4 @@ module BoxGrinder
     end
 
   end
-end
+end

data/spec/helpers/guestfs-helper-spec.rb

@@ -290,12 +290,14 @@ module BoxGrinder
       it "should return false if we're on EC2" do
         URI.should_receive(:parse).with('http://169.254.169.254/latest/meta-data/ami-id').and_return('parsed')
         Net::HTTP.should_receive(:get_response).with("parsed").and_return(OpenCascade.new(:code => '200'))
+        @helper.should_receive(:`).with("egrep '^flags.*(vmx|svm)' /proc/cpuinfo | wc -l").and_return("0")
         @helper.hw_virtualization_available?.should == false
       end
 
       it "should return false if we're NOT on EC2 and AMI id retrieval raised an exception" do
         URI.should_receive(:parse).with('http://169.254.169.254/latest/meta-data/ami-id').and_return('parsed')
         Net::HTTP.should_receive(:get_response).with("parsed").and_raise "Boom"
+        @helper.should_receive(:`).with("egrep '^flags.*(vmx|svm)' /proc/cpuinfo | wc -l").and_return("0")
         @helper.hw_virtualization_available?.should == false
       end
     end
@@ -397,4 +399,4 @@ module BoxGrinder
       end
     end
   end
-end
+end

data/spec/helpers/s3-helper-spec.rb

@@ -29,8 +29,7 @@ module BoxGrinder
       AWS.config({:access_key_id => '', :secret_access_key => ''})
       @ec2 = AWS::EC2.new
       @s3 = AWS::S3.new
-      @ec2helper = EC2Helper.new(@ec2)
-      @s3helper = S3Helper.new(@ec2, @s3)
+      @s3helper = S3Helper.new(@ec2, @s3, :log => LogHelper.new(:level => :trace, :type => :stdout))
       @s3obj = mock(AWS::S3::S3Object)
       @bucket = mock(AWS::S3::Bucket)
     end
@@ -98,22 +97,6 @@ module BoxGrinder
       end
     end
 
-    describe ".object_exists?"  do
-
-      it "should return true if the object exists" do
-        @s3obj.stub!(:exists?).and_return(true)
-        @s3obj.should_receive(:exists?).and_return(true)
-        @s3helper.object_exists?(@s3obj).should == true
-      end
-
-      it "should return false if the object does not exist" do
-        @s3obj.stub!(:exists?).and_return(false)
-        @s3obj.should_receive(:exists?).and_return(false)
-        @s3helper.object_exists?(@s3obj).should == false
-      end
-
-    end
-
     describe ".delete_folder" do
 
       it "should delete a folder from a bucket" do
@@ -165,4 +148,4 @@ module BoxGrinder
 
 
   end
-end
+end