boxgrinder-build 0.0.3 → 0.0.4

data/lib/boxgrinder-build.rb

@@ -22,7 +22,7 @@
 
 require 'rubygems'
 
-gem 'boxgrinder-core', '>= 0.0.1'
+gem 'boxgrinder-core', '>= 0.0.2'
 gem 'aws-s3', '>= 0.6.2'
 gem 'amazon-ec2', '>= 0.9.6'
 gem 'net-sftp', '>= 2.0.4'
@@ -39,10 +39,10 @@ rescue LoadError
 end
 
 task :default do
-    puts "Run '#{Rake.application.name} -T' to get list of all available commands."
+  puts "Run '#{Rake.application.name} -T' to get list of all available commands."
 end
 
-BoxGrinder::RakeHelper.new
+BoxGrinder::RakeHelper.new( :version => "1.0.0.Beta2", :release => "SNAPSHOT" )
 
 Rake.application.init('boxgrinder')
 Rake.application.top_level

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

@@ -31,9 +31,8 @@ module BoxGrinder
 
       aws_validator = AWSValidator.new( @config )
       aws_validator.validate_aws_config( @config.data['aws'] )
-      aws_validator.validate_aws_release_config( @config.data['release'] )
 
-      @aws_data   = @config.data['aws']
+      @aws_data = @config.data['aws']
 
       # remove dashes from account number
       @aws_data['account_number'] = @aws_data['account_number'].to_s.gsub(/-/, '')
@@ -47,7 +46,7 @@ module BoxGrinder
     attr_reader :s3
 
     def bucket_key( appliance_name )
-      "#{@config.release.s3['bucket_name']}/#{@config.version_with_release}/#{@appliance_config.hardware.arch}/#{appliance_name}"
+      "#{@aws_data['bucket_name']}/#{appliance_name}/#{@appliance_config.version}.#{@appliance_config.release}/#{@appliance_config.hardware.arch}"
     end
 
     def bucket_manifest_key( appliance_name )

data/lib/boxgrinder-build/images/ec2-image.rb

@@ -155,9 +155,25 @@ module BoxGrinder
 
       if @appliance_config.os.name.eql?("fedora") and @appliance_config.os.version.to_s.eql?("12")
         @log.debug "Downgrading udev package to use in EC2 environment..."
+
+        repo_included = false
+
+        @appliance_config.repos.each do |repo|
+          repo_included = true if repo['baseurl'] == "http://repo.boxgrinder.org/boxgrinder/packages/fedora/12/RPMS/#{@appliance_config.hardware.arch}"
+        end
+
+        guestfs.upload( "#{@config.dir.base}/src/ec2/f12-#{@appliance_config.hardware.arch}-boxgrinder.repo", "/etc/yum.repos.d/f12-#{@appliance_config.hardware.arch}-boxgrinder.repo" ) unless repo_included
         guestfs.sh( "yum -y downgrade udev-142" )
         guestfs.upload( "#{@config.dir.base}/src/f12/yum.conf", "/etc/yum.conf" )
+        guestfs.rm_rf( "/etc/yum.repos.d/f12-#{@appliance_config.hardware.arch}-boxgrinder.repo" ) unless repo_included
+
         @log.debug "Package udev downgraded."
+
+        # TODO EC2 fix, remove that after Fedora pushes kernels to Amazon
+        @log.debug "Disabling unnecessary services..."
+        guestfs.sh( "/sbin/chkconfig ksm off" ) if guestfs.exists( "/etc/init.d/ksm" ) != 0
+        guestfs.sh( "/sbin/chkconfig ksmtuned off" ) if guestfs.exists( "/etc/init.d/ksmtuned" ) != 0
+        @log.debug "Services disabled."
       end
 
       guestfs.close

data/lib/boxgrinder-build/images/raw-image.rb

@@ -94,7 +94,7 @@ module BoxGrinder
       @log.debug "Changing configuration files using augeas..."
       guestfs.aug_init( "/", 0 )
       # don't use DNS for SSH
-      guestfs.aug_set( "/files/etc/ssh/sshd_config/UseDNS", "no" ) if guestfs.exists( '/etc/ssh/sshd_config' )
+      guestfs.aug_set( "/files/etc/ssh/sshd_config/UseDNS", "no" ) if guestfs.exists( '/etc/ssh/sshd_config' ) != 0
       guestfs.aug_save
       @log.debug "Augeas changes saved."
     end

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

@@ -45,14 +45,7 @@ module BoxGrinder
       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?
-    end
-
-    # TODO we're using this?
-    def validate_aws_release_config( config )
-      return if config.nil?
-
-      raise ValidationError, "No 's3' subsection in 'release' section in configuration file (#{@config.config_file})." if config['s3'].nil?
-      raise ValidationError, "Please specify bucket name in 's3' subsection in configuration file (#{@config.config_file})." if config['s3']['bucket_name'].nil? or config['s3']['bucket_name'].length == 0
+      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

data/src/ec2/f12-i386-boxgrinder.repo

@@ -0,0 +1,11 @@
+[boxgrinder-i386]
+name=boxgrinder-i386
+enabled=1
+gpgcheck=0
+baseurl=http://repo.boxgrinder.org/boxgrinder/packages/fedora/12/RPMS/i386
+
+[boxgrinder-noarch]
+name=boxgrinder-noarch
+enabled=1
+gpgcheck=0
+baseurl=http://repo.boxgrinder.org/boxgrinder/packages/fedora/12/RPMS/noarch

data/src/ec2/f12-x86_64-boxgrinder.repo

@@ -0,0 +1,11 @@
+[boxgrinder-x86_64]
+name=boxgrinder-x86_64
+enabled=1
+gpgcheck=0
+baseurl=http://repo.boxgrinder.org/boxgrinder/packages/fedora/12/RPMS/x86_64
+
+[boxgrinder-noarch]
+name=boxgrinder-noarch
+enabled=1
+gpgcheck=0
+baseurl=http://repo.boxgrinder.org/boxgrinder/packages/fedora/12/RPMS/noarch

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - BoxGrinder Project
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 +01:00
+date: 2010-03-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,8 +27,8 @@ dependencies:
         segments: 
         - 0
         - 0
-        - 2
-        version: 0.0.2
+        - 3
+        version: 0.0.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -143,8 +143,10 @@ files:
 - src/base.vmdk
 - src/base.repo
 - src/ec2/fstab_64bit
+- src/ec2/f12-i386-boxgrinder.repo
 - src/ec2/rc_local
 - src/ec2/ifcfg-eth0
+- src/ec2/f12-x86_64-boxgrinder.repo
 - src/ec2/fstab_32bit
 - docs/node-info/pom.xml
 - docs/node-info/src/main/webapp/WEB-INF/web.xml