boxgrinder-build 0.0.1

data/lib/boxgrinder-build/appliance.rb

@@ -0,0 +1,52 @@
+# 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 'rake/tasklib'
+
+require 'boxgrinder-build/appliance-kickstart.rb'
+require 'boxgrinder-build/images/raw-image.rb'
+require 'boxgrinder-build/images/vmware-image'
+require 'boxgrinder-build/images/ec2-image'
+require 'boxgrinder-build/helpers/release-helper'
+require 'boxgrinder-build/validators/appliance-dependency-validator'
+
+module BoxGrinder
+  class Appliance < Rake::TaskLib
+
+    def initialize( config, appliance_config, options = {} )
+      @config            = config
+      @appliance_config  = appliance_config
+      @log               = options[:log] || Logger.new(STDOUT)
+
+      define
+    end
+
+    def define
+      ApplianceKickstart.new( @config, @appliance_config, :log => @log )
+      ApplianceDependencyValidator.new( @config, @appliance_config, :log => @log )
+
+      RAWImage.new( @config, @appliance_config, :log => @log  )
+      VMwareImage.new( @config, @appliance_config, :log => @log  )
+      EC2Image.new( @config, @appliance_config, :log => @log )
+
+      ReleaseHelper.new( @config, @appliance_config, :log => @log )
+    end
+  end
+end

data/lib/boxgrinder-build/boxgrinder.rb

@@ -0,0 +1,92 @@
+# 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 'rake'
+require 'boxgrinder-core/defaults'
+require 'boxgrinder-core/models/config'
+require 'boxgrinder-core/models/appliance-config'
+require 'boxgrinder-core/helpers/appliance-config-helper'
+require 'boxgrinder-build/appliance'
+require 'boxgrinder-build/validators/validator'
+require 'boxgrinder-build/validators/appliance-config-parameter-validator'
+require 'boxgrinder-build/validators/appliance-definition-validator'
+require 'boxgrinder-build/helpers/rake-helper'
+require 'ostruct'
+require 'yaml'
+
+$stderr.reopen($stdout)
+
+module BoxGrinder
+  class BoxGrinder
+    def initialize( project_config = Hash.new )
+      @log = LOG
+      # validates parameters, this is a pre-validation
+      ApplianceConfigParameterValidator.new.validate
+
+      name    =   project_config[:name]     || DEFAULT_PROJECT_CONFIG[:name]
+      version =   project_config[:version]  || DEFAULT_PROJECT_CONFIG[:version]
+      release =   project_config[:release]  || DEFAULT_PROJECT_CONFIG[:release]
+
+      # dirs
+
+      dir = OpenStruct.new
+      dir.root        = `pwd`.strip
+      dir.base        = "#{File.dirname( __FILE__ )}/../../"
+      dir.build       = project_config[:dir_build]          || DEFAULT_PROJECT_CONFIG[:dir_build]
+      dir.top         = project_config[:dir_top]            || "#{dir.build}/topdir"
+      dir.src_cache   = project_config[:dir_src_cache]      || DEFAULT_PROJECT_CONFIG[:dir_src_cache]
+      dir.rpms_cache  = project_config[:dir_rpms_cache]     || DEFAULT_PROJECT_CONFIG[:dir_rpms_cache]
+      dir.specs       = project_config[:dir_specs]          || DEFAULT_PROJECT_CONFIG[:dir_specs]
+      dir.appliances  = project_config[:dir_appliances]     || DEFAULT_PROJECT_CONFIG[:dir_appliances]
+      dir.src         = project_config[:dir_src]            || DEFAULT_PROJECT_CONFIG[:dir_src]
+      dir.kickstarts  = project_config[:dir_kickstarts]     || DEFAULT_PROJECT_CONFIG[:dir_kickstarts]
+
+      config_file = ENV['BG_CONFIG_FILE'] || "#{ENV['HOME']}/.boxgrinder/config"
+
+      @config = Config.new( name, version, release, dir, config_file )
+
+      define_rules
+    end
+
+    def define_rules
+      Validator.new( @config, :log => @log )
+
+      Rake::Task[ 'validate:all' ].invoke
+
+      directory @config.dir.build
+
+      definitions = {}
+
+      Dir[ "#{@config.dir.appliances}/**/*.appl", "#{@config.dir.base}/appliances/*.appl" ].each do |file|
+        definition = YAML.load_file( file )
+
+        ApplianceDefinitionValidator.new( definition ).validate
+        
+        definitions[definition['name']] = definition
+      end
+
+      for definition in definitions.values
+        Appliance.new( @config, ApplianceConfigHelper.new( definitions ).merge( ApplianceConfig.new( definition ).init_arch ).initialize_paths, :log => @log )
+      end
+    end
+
+    attr_reader :config
+  end
+end

data/lib/boxgrinder-build/erb/appliance.ks.erb

@@ -0,0 +1,44 @@
+lang en_US.UTF-8
+keyboard us
+timezone US/Eastern
+auth --useshadow --enablemd5
+selinux --permissive
+firewall --disabled
+bootloader --timeout=1 --append="acpi=force scsi_mod.scan=sync"
+firstboot --disabled
+
+<% if graphical %>
+xconfig --startxonboot
+services --enabled=NetworkManager --disabled=network,sshd
+<% else %>
+network --bootproto=dhcp --device=eth0 --onboot=on
+services --enabled=network
+<% end %>
+
+rootpw <%= root_password %> 
+
+<% for partition in partitions %>
+part <%= partition['root'] %> --size <%= partition['size'].to_i * 1024 %> --fstype <%= fstype %> --ondisk sda<% end %>
+
+<% for user in users %>
+user --name=<%= user['name'] %><% unless user['home'].nil? %> --homedir=<%= user['home'] %><% end %><% unless user['group'].nil? %> --groups=<%= user['group'] %><% end %><% end unless users.nil? %>
+
+<% for repo in repos %>
+<%= repo %><% end %>
+
+<% if graphical %>
+%packages --excludedocs
+<% else %>
+%packages --excludedocs --nobase
+<% end %>
+
+<% for package in packages %>
+  <%= package %><% end %>
+%end
+%post
+
+<% if graphical %>
+chkconfig --level 345 firstboot off 2>/dev/null<% end %>
+
+%end
+

data/lib/boxgrinder-build/helpers/appliance-customize-helper.rb

@@ -0,0 +1,92 @@
+# 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 'rake/tasklib'
+require 'boxgrinder-core/validators/errors'
+require 'boxgrinder-build/helpers/guestfs-helper'
+require 'tempfile'
+
+module BoxGrinder
+  class ApplianceCustomizeHelper < Rake::TaskLib
+
+    def initialize( config, appliance_config, disk, options = {} )
+      @config           = config
+      @appliance_config = appliance_config
+      @disk             = disk
+
+      @log          = options[:log]         || Logger.new(STDOUT)
+      @exec_helper  = options[:exec_helper] || ExecHelper.new( { :log => @log } )
+    end
+
+    def customize
+      @guestfs_helper = GuestFSHelper.new( @disk, :log => @log )
+      @guestfs = @guestfs_helper.guestfs
+
+      yield self, @guestfs
+
+      @guestfs.close
+    end
+
+    def validate_options( options )
+      options = {
+              :packages => {},
+              :repos => []
+      }.merge(options)
+
+      options[:packages][:yum] = options[:packages][:yum] || []
+      options[:packages][:yum_local] = options[:packages][:yum_local] || []
+      options[:packages][:rpm] = options[:packages][:rpm] || []
+
+      if ( options[:packages][:yum_local].size == 0 and options[:packages][:rpm].size == 0 and options[:packages][:yum].size == 0 and options[:repos].size == 0)
+        @log.debug "No additional local or remote packages or gems to install, skipping..."
+        return false
+      end
+
+      true
+    end
+
+    def install_packages( options = {} )
+      # silent return, we don't have any packages to install
+      return unless validate_options( options )
+
+      @guestfs_helper.rebuild_rpm_database
+
+      for repo in options[:repos]
+        @log.debug "Installing repo file '#{repo}'..."
+        @guestfs.sh( "rpm -Uvh #{repo}" )
+        @log.debug "Repo file '#{repo}' installed."
+      end unless options[:repos].nil?
+
+      unless options[:packages].nil?
+        for yum_package in options[:packages][:yum]
+          @log.debug "Installing package '#{yum_package}'..."
+          @guestfs.sh( "yum -y install #{yum_package}" )
+          @log.debug "Package '#{yum_package}' installed."
+        end unless options[:packages][:yum].nil?
+
+        for package in options[:packages][:rpm]
+          @log.debug "Installing package '#{package}'..."
+          @guestfs.sh( "rpm -Uvh --force #{package}" )
+          @log.debug "Package '#{package}' installed."
+        end unless options[:packages][:rpm].nil?
+      end
+    end
+  end
+end

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

@@ -0,0 +1,75 @@
+# 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 'AWS'
+require 'aws/s3'
+require 'boxgrinder-core/defaults'
+require 'boxgrinder-build/validators/aws-validator'
+
+module BoxGrinder
+  class AWSHelper
+    def initialize( config, appliance_config )
+      @config           = config
+      @appliance_config = appliance_config
+
+      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']
+
+      # remove dashes from account number
+      @aws_data['account_number'] = @aws_data['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'] )
+    end
+
+    attr_reader :aws_data
+    attr_reader :ec2
+    attr_reader :s3
+
+    def bucket_key( appliance_name )
+      "#{@config.release.s3['bucket_name']}/#{@config.version_with_release}/#{@appliance_config.hardware.arch}/#{appliance_name}"
+    end
+
+    def bucket_manifest_key( appliance_name )
+      "#{bucket_key( appliance_name )}/#{appliance_name}.ec2.manifest.xml"
+    end
+
+    def appliance_is_registered?( appliance_name )
+      !ami_info( appliance_name ).nil?
+    end
+
+    def ami_info( appliance_name )
+      ami_info = nil
+
+      images = @ec2.describe_images( :owner_id => @aws_data['account_number'] ).imagesSet
+
+      return nil if images.nil?
+
+      for image in images.item do
+        ami_info = image if (image.imageLocation.eql?( bucket_manifest_key( appliance_name ) ))
+      end
+
+      ami_info
+    end
+  end
+end

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

@@ -0,0 +1,86 @@
+# 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 'guestfs'
+
+module BoxGrinder
+  class GuestFSHelper
+    def initialize( raw_disk, options = {} )
+      @raw_disk = raw_disk
+      @log      = options[:log] || Logger.new(STDOUT)
+
+      launch
+    end
+
+    attr_reader :guestfs
+
+    def launch
+      @log.debug "Preparing guestfs..."
+      @guestfs = Guestfs::create
+
+      # TODO remove this, https://bugzilla.redhat.com/show_bug.cgi?id=502058
+      @guestfs.set_append( "noapic" )
+
+      # workaround for latest qemu
+      # It'll only work if qemu-stable package is installed. It is installed by default on meta-appliance
+      # TODO wait for stable qemu and remove this
+      qemu_wrapper = "/usr/share/qemu-stable/bin/qemu.wrapper"
+
+      if File.exists?( qemu_wrapper )
+        @guestfs.set_qemu( qemu_wrapper )
+      end
+
+      @log.debug "Adding drive '#{@raw_disk}'..."
+      @guestfs.add_drive( @raw_disk )
+      @log.debug "Drive added."
+
+      @log.debug "Launching guestfs..."
+      @guestfs.launch
+      @log.debug "Waiting for guestfs..."
+      @guestfs.wait_ready
+      @log.debug "Guestfs launched."
+
+      if @guestfs.list_partitions.size > 0
+        partition_to_mount = "/dev/sda1"
+      else
+        partition_to_mount = "/dev/sda"
+      end
+
+      @log.debug "Mounting root partition..."
+      @guestfs.mount( partition_to_mount, "/" )
+      @log.debug "Root partition mounted."
+
+      # TODO is this really needed?
+      @log.debug "Uploading '/etc/resolv.conf'..."
+      @guestfs.upload( "/etc/resolv.conf", "/etc/resolv.conf" )
+      @log.debug "'/etc/resolv.conf' uploaded."
+
+      @log.debug "Guestfs launched."
+    end
+
+    # TODO this is shitty, I know... https://bugzilla.redhat.com/show_bug.cgi?id=507188
+    def rebuild_rpm_database
+      @log.debug "Cleaning RPM database..."
+      @guestfs.sh( "rm -f /var/lib/rpm/__db.*" )
+      @guestfs.sh( "rpm --rebuilddb" )
+      @log.debug "Cleaning RPM database finished."
+    end
+  end
+end

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

@@ -0,0 +1,71 @@
+# 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 'rubygems'
+require 'boxgrinder-build/boxgrinder'
+require 'boxgrinder-core/helpers/log-helper'
+
+gem 'amazon-ec2', '>= 0.9.6'
+gem 'aws-s3', '>= 0.6.2'
+gem 'net-sftp', '>= 2.0.4'
+gem 'net-ssh', '>= 2.0.20'
+
+module Rake
+  class Task
+    alias_method :execute_original_boxgrinder, :execute
+
+    def execute( args = nil )
+      begin
+        execute_original_boxgrinder( args )
+      rescue => e
+        log = BoxGrinder::LOG
+        log.fatal e.info
+        log.fatal "Aborting: #{e.message}. See previous errors for more information."
+        abort
+      end
+    end
+  end
+end
+
+module BoxGrinder
+
+  LOG = LogHelper.new
+
+  class RakeHelper
+    def initialize( project_config = {} )
+      log = LOG
+      begin
+        log.debug "Running new Rake session..."
+        @config = BoxGrinder.new( project_config ).config
+      rescue ValidationError => e
+        log.fatal "ValidationError: #{e.message}."
+        abort
+      rescue => e
+        log.fatal e
+        log.fatal "Aborting: #{e.message}. See previous errors for more information."
+        abort
+      end
+    end
+
+    attr_reader :config
+  end
+end
+
+

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

@@ -0,0 +1,135 @@
+# 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 'rake/tasklib'
+require 'boxgrinder-core/validators/errors'
+require 'boxgrinder-build/validators/ssh-validator'
+require 'boxgrinder-build/models/ssh-config'
+require 'boxgrinder-build/helpers/ssh-helper'
+
+module BoxGrinder
+  class ReleaseHelper < Rake::TaskLib
+    def initialize( config, appliance_config, options = {} )
+      @config = config
+      @appliance_config = appliance_config
+
+      @log          = options[:log]         || Logger.new(STDOUT)
+      @exec_helper  = options[:exec_helper] || ExecHelper.new( { :log => @log } )
+
+      @package_build_commands = {
+              :raw => {
+                      :tgz => "tar -C #{@appliance_config.path.dir.raw.build_full} -cvzf #{@appliance_config.path.file.package[:raw][:tgz]} #{@appliance_config.name}-sda.raw #{@appliance_config.name}.xml",
+                      :zip => "cd #{@appliance_config.path.dir.raw.build_full} && zip -r #{Dir.pwd}/#{@appliance_config.path.file.package[:raw][:zip]} ."
+              },
+              :vmware => {
+                      :tgz => "tar -C #{@appliance_config.path.dir.vmware.build} -cvzf '#{@appliance_config.path.file.package[:vmware][:tgz]}' README #{@appliance_config.name}-sda.raw personal/#{@appliance_config.name}.vmx personal/#{@appliance_config.name}.vmdk enterprise/#{@appliance_config.name}.vmx enterprise/#{@appliance_config.name}.vmdk",
+                      :zip => "cd #{@appliance_config.path.dir.vmware.build} && zip #{Dir.pwd}/#{@appliance_config.path.file.package[:vmware][:zip]} README #{@appliance_config.name}-sda.raw personal/#{@appliance_config.name}.vmx personal/#{@appliance_config.name}.vmdk enterprise/#{@appliance_config.name}.vmx enterprise/#{@appliance_config.name}.vmdk"
+              }
+      }
+
+      @base_remote_file_path = "#{@config.version_with_release}/#{@appliance_config.hardware.arch}"
+
+      define_tasks
+    end
+
+    def define_tasks
+
+      directory @appliance_config.path.dir.packages
+
+      [ :tgz, :zip ].each do |package_format|
+        task "appliance:#{@appliance_config.name}:package:#{package_format}" => [ @appliance_config.path.file.package[:raw][package_format], @appliance_config.path.file.package[:vmware][package_format] ]
+
+        [ :vmware, :raw ].each do |image_format|
+          basename = File.basename( @appliance_config.path.file.package[image_format][package_format] )
+          files_to_upload = { basename => @appliance_config.path.file.package[image_format][package_format] }
+
+          desc "Create #{image_format.to_s.upcase} #{package_format.to_s.upcase} package for #{@appliance_config.simple_name} appliance"
+          task "appliance:#{@appliance_config.name}:package:#{image_format}:#{package_format}" => [ @appliance_config.path.file.package[image_format][package_format] ]
+
+          file @appliance_config.path.file.package[image_format][package_format] => [ @appliance_config.path.dir.packages, "appliance:#{@appliance_config.name}" ] do
+            @log.info "Packaging #{@appliance_config.name} appliance #{image_format.to_s.upcase} image (#{@appliance_config.os.name} #{@appliance_config.os.version}, #{@appliance_config.hardware.arch} arch, #{package_format.to_s.upcase} format)..."
+
+            Rake::Task[ "#{@appliance_config.path.dir.vmware.build}/README" ].invoke if image_format.eql?(:vmware)
+
+            @exec_helper.execute @package_build_commands[image_format][package_format]
+            @log.info "#{image_format.to_s.upcase} #{package_format.to_s.upcase} package created."
+          end
+
+          task "appliance:#{@appliance_config.name}:upload:#{image_format}:#{package_format}:ssh" => [ "appliance:#{@appliance_config.name}:package:#{image_format}:#{package_format}" ] do
+            upload_via_ssh( files_to_upload )
+          end
+
+          task "appliance:#{@appliance_config.name}:upload:#{image_format}:#{package_format}:cloudfront" => [ "appliance:#{@appliance_config.name}:package:#{image_format}:#{package_format}" ] do
+            upload_to_cloudfront( files_to_upload )
+          end
+        end
+      end
+
+      file "#{@appliance_config.path.dir.vmware.build}/README" => [ "appliance:#{@appliance_config.name}:vmware:personal", "appliance:#{@appliance_config.name}:vmware:enterprise" ] do
+        readme = File.open( "#{@config.dir.base}/src/README.vmware" ).read
+
+        readme.gsub!( /#APPLIANCE_NAME#/, @appliance_config.name )
+        readme.gsub!( /#NAME#/, @config.name )
+        readme.gsub!( /#VERSION#/, @config.version_with_release )
+
+        File.open( "#{@appliance_config.path.dir.vmware.build}/README", "w") {|f| f.write( readme ) }
+      end
+
+    end
+
+    def upload_via_ssh( files )
+      @log.info "Uploading #{@appliance_config.name} appliance via SSH..."
+
+      SSHValidator.new( @config ).validate
+
+      ssh_config = SSHConfig.new( @config )
+
+      ssh_helper = SSHHelper.new( ssh_config.options, { :log => @log } )
+      ssh_helper.connect
+      ssh_helper.upload_files( ssh_config.cfg['remote_release_path'], files )
+      ssh_helper.disconnect
+
+      @log.info "Appliance #{@appliance_config.simple_name} uploaded."
+    end
+
+    def upload_to_cloudfront( files )
+
+      bucket = @config.release.cloudfront['bucket_name']
+
+      @log.info "Uploading #{@appliance_config.name} appliance to CloudFront bucket '#{bucket}'..."
+
+      begin
+        AWS::S3::Bucket.find( bucket )
+      rescue AWS::S3::NoSuchBucket
+        AWS::S3::Bucket.create( bucket )
+        retry
+      end
+
+      for key in files.keys
+        unless S3Object.exists?( key, bucket )
+          AWS::S3::S3Object.store( key, open( files[key] ), bucket, :access => :public_read )
+        end
+      end
+
+      @log.info "Appliance #{@appliance_config.simple_name} uploaded."
+    end
+  end
+end
+