boxgrinder-build 0.2.0 → 0.3.2

data/lib/boxgrinder-build/{images/raw-image.rb → plugins/os/base/rpm-based-os-plugin.rb}

@@ -18,76 +18,78 @@
 # 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 'yaml'
-require 'boxgrinder-build/helpers/guestfs-helper'
-require 'boxgrinder-core/helpers/exec-helper'
+require 'boxgrinder-build/plugins/os/base-operating-system-plugin'
 
 module BoxGrinder
-  class RAWImage < Rake::TaskLib
+  class RPMBasedOSPlugin < BaseOperatingSystemPlugin
+    def after_init
+      @deliverables[:disk] = "#{@appliance_config.path.dir.raw.build_full}/#{@appliance_config.name}-sda.raw"
 
-    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 } )
-
-      @tmp_dir = "#{@config.dir.root}/#{@config.dir.build}/tmp"
-
-      define_tasks
+      @deliverables[:metadata]  = {
+              :descriptor   => "#{@appliance_config.path.dir.raw.build_full}/#{@appliance_config.name}.xml"
+      }
     end
 
-    def define_tasks
-      desc "Build #{@appliance_config.simple_name} appliance."
-      task "appliance:#{@appliance_config.name}" => [ @appliance_config.path.file.raw.xml, "appliance:#{@appliance_config.name}:validate:dependencies" ]
+    def build_with_appliance_creator( repos )
+      Kickstart.new( @config, @appliance_config, repos, :log => @log ).create
+      RPMDependencyValidator.new( @config, @appliance_config, @options ).resolve_packages
 
-      directory @tmp_dir
+      tmp_dir = "#{@config.dir.root}/#{@config.dir.build}/tmp"
+      FileUtils.mkdir_p( tmp_dir )
 
-      file @appliance_config.path.file.raw.xml => [ @appliance_config.path.file.raw.kickstart, "appliance:#{@appliance_config.name}:validate:dependencies", @tmp_dir ] do
-        build_raw_image
-        do_post_build_operations
-      end
-    end
-
-    def build_raw_image
-      @log.info "Building #{@appliance_config.simple_name} appliance..."
+      @log.info "Building #{@appliance_config.name} appliance..."
 
-      @exec_helper.execute "sudo PYTHONUNBUFFERED=1 appliance-creator -d -v -t #{@tmp_dir} --cache=#{@config.dir.rpms_cache}/#{@appliance_config.main_path} --config #{@appliance_config.path.file.raw.kickstart} -o #{@appliance_config.path.dir.raw.build} --name #{@appliance_config.name} --vmem #{@appliance_config.hardware.memory} --vcpu #{@appliance_config.hardware.cpus}"
+      @exec_helper.execute "sudo appliance-creator -d -v -t #{tmp_dir} --cache=#{@config.dir.rpms_cache}/#{@appliance_config.main_path} --config #{@appliance_config.path.file.raw.kickstart} -o #{@appliance_config.path.dir.raw.build} --name #{@appliance_config.name} --vmem #{@appliance_config.hardware.memory} --vcpu #{@appliance_config.hardware.cpus}"
 
       # fix permissions
       @exec_helper.execute "sudo chmod 777 #{@appliance_config.path.dir.raw.build_full}"
-      @exec_helper.execute "sudo chmod 666 #{@appliance_config.path.file.raw.disk}"
-      @exec_helper.execute "sudo chmod 666 #{@appliance_config.path.file.raw.xml}"
+      @exec_helper.execute "sudo chmod 666 #{@deliverables[:disk]}"
+      @exec_helper.execute "sudo chmod 666 #{@deliverables[:metadata][:descriptor]}"
+
+      customize( @deliverables[:disk] ) do |guestfs, guestfs_helper|
+        @log.info "Executing post operations after build..."
+
+        mount_partitions( guestfs, guestfs_helper ) if guestfs.list_partitions.size > 1
+
+        if @appliance_config.post.base.size > 0
+          @appliance_config.post.base.each do |cmd|
+            @log.debug "Executing #{cmd}"
+            guestfs.sh( cmd )
+          end
+          @log.debug "Post commands from appliance definition file executed."
+        else
+          @log.debug "No commands specified, skipping."
+        end
 
-      @log.info "Appliance #{@appliance_config.simple_name} was built successfully."
-    end
+        change_configuration( guestfs )
+        set_motd( guestfs )
+        install_version_files( guestfs )
+        install_repos( guestfs )
+
+        yield guestfs, guestfs_helper if block_given?
 
-    def do_post_build_operations
-      @log.info "Executing post operations after build..."
+        @log.info "Post operations executed."
+      end
 
-      guestfs_helper = GuestFSHelper.new( @appliance_config.path.file.raw.disk, :log => @log )
-      guestfs = guestfs_helper.guestfs
+      @log.info "Base image for #{@appliance_config.name} appliance was built successfully."
+    end
 
-      change_configuration( guestfs )
-      set_motd( guestfs )
-      install_version_files( guestfs )
-      install_repos( guestfs )
+    def mount_partitions( guestfs, guestfs_helper )
+      root_partition = nil
 
-      @log.debug "Executing post commands from appliance definition file..."
-      if @appliance_config.post.base.size > 0
-        for cmd in @appliance_config.post.base
-          @log.debug "Executing #{cmd}"
-          guestfs.sh( cmd )
+      guestfs.list_partitions.each do |partition|
+        guestfs_helper.mount_partition( partition, '/' )
+        if guestfs.exists( '/sbin/e2label' ) != 0
+          root_partition = partition
+          break
         end
-        @log.debug "Post commands from appliance definition file executed."
-      else
-        @log.debug "No commands specified, skipping."
+        guestfs.umount( partition )
       end
 
-      guestfs.close
-
-      @log.info "Post operations executed."
+      guestfs.list_partitions.each do |partition|
+        next if partition == root_partition
+        guestfs_helper.mount_partition( partition, guestfs.sh( "/sbin/e2label #{partition}" ).chomp.strip )
+      end
     end
 
     def change_configuration( guestfs )
@@ -99,11 +101,18 @@ module BoxGrinder
       @log.debug "Augeas changes saved."
     end
 
+    def install_version_files( guestfs )
+      @log.debug "Installing BoxGrinder version files..."
+      guestfs.sh( "echo 'BOXGRINDER_VERSION=#{@config.version_with_release}' > /etc/sysconfig/boxgrinder" )
+      guestfs.sh( "echo 'APPLIANCE_NAME=#{@appliance_config.name}' >> /etc/sysconfig/boxgrinder" )
+      @log.debug "Version files installed."
+    end
+
     def set_motd( guestfs )
       @log.debug "Setting up '/etc/motd'..."
       # set nice banner for SSH
       motd_file = "/etc/init.d/motd"
-      guestfs.upload( "#{@config.dir.base}/src/motd.init", motd_file )
+      guestfs.upload( "#{File.dirname( __FILE__ )}/src/motd.init", motd_file )
       guestfs.sh( "sed -i s/#VERSION#/'#{@appliance_config.version}.#{@appliance_config.release}'/ #{motd_file}" )
       guestfs.sh( "sed -i s/#APPLIANCE#/'#{@appliance_config.name} appliance'/ #{motd_file}" )
 
@@ -112,18 +121,11 @@ module BoxGrinder
       @log.debug "'/etc/motd' is nice now."
     end
 
-    def install_version_files( guestfs )
-      @log.debug "Installing BoxGrinder version files..."
-      guestfs.sh( "echo 'BOXGRINDER_VERSION=#{@config.version_with_release}' > /etc/sysconfig/boxgrinder" )
-      guestfs.sh( "echo 'APPLIANCE_NAME=#{@appliance_config.name}' >> /etc/sysconfig/boxgrinder" )
-      @log.debug "Version files installed."
-    end
-
     def install_repos( guestfs )
       @log.debug "Installing repositories from appliance definition file..."
       @appliance_config.repos.each do |repo|
         @log.debug "Installing #{repo['name']} repo..."
-        repo_file = File.read( "#{@config.dir.base}/src/base.repo").gsub( /#NAME#/, repo['name'] )
+        repo_file = File.read( "#{File.dirname( __FILE__ )}/src/base.repo").gsub( /#NAME#/, repo['name'] )
 
         ['baseurl', 'mirrorlist'].each  do |type|
           repo_file << ("#{type}=#{repo[type]}\n") unless repo[type].nil?
@@ -133,5 +135,6 @@ module BoxGrinder
       end
       @log.debug "Repositories installed."
     end
+
   end
 end

data/lib/boxgrinder-build/{erb → plugins/os/base/src}/appliance.ks.erb

@@ -17,11 +17,8 @@ services --enabled=network
 
 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? %>
+<% appliance_config.hardware.partitions.each do |root, partition| %>
+part <%= root %> --size <%= (partition['size'].to_f * 1024).to_i %> --fstype <%= fstype %> --ondisk sda<% end %>
 
 <% for repo in repos %>
 <%= repo %><% end %>

data/lib/boxgrinder-build/{validators/appliance-dependency-validator.rb → plugins/os/base/validators/rpm-dependency-validator.rb}

@@ -33,7 +33,7 @@ module BoxGrinder
     attr_reader :mirrorlist
   end
 
-  class ApplianceDependencyValidator
+  class RPMDependencyValidator
     def initialize( config, appliance_config, options = {} )
       @config = config
       @appliance_config = appliance_config

data/lib/boxgrinder-build/{models/ssh-config.rb → plugins/os/base-operating-system-plugin.rb}

@@ -18,27 +18,20 @@
 # 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'
-require 'yaml'
+require 'boxgrinder-build/managers/operating-system-plugin-manager'
+require 'boxgrinder-build/plugins/base-plugin'
 
 module BoxGrinder
-  class SSHConfig
-    def initialize( config )
-      @config   = config
-      @cfg      = @config.data['ssh']
-      @options  = {}
+  class BaseOperatingSystemPlugin < BasePlugin
+    def self.inherited(klass)
+      OperatingSystemPluginManager.instance << klass
+    end
 
-      # defaults
-      @options['sftp_create_path']          = true
-      @options['sftp_overwrite']            = false
-      @options['sftp_default_permissions']  = 0644
+    alias_method :execute_original, :execute
 
-      @options['host']                      = @config.release.ssh['host']
-      @options['username']                  = @config.release.ssh['username']
-      @options['password']                  = @config.release.ssh['password']
+    def execute( args = nil )
+      raise "Build cannot be started before the plugin isn't initialized" if @initialized.nil?
+      execute_original( args )
     end
-
-    attr_reader :options
-    attr_reader :cfg
   end
 end

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

@@ -0,0 +1,72 @@
+# 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-build/plugins/os/base/rpm-based-os-plugin'
+
+module BoxGrinder
+  class CentOSPlugin < RPMBasedOSPlugin
+
+    CENTOS_REPOS = {
+            "5" => {
+                    "base" => {
+                            "mirrorlist" => "http://mirrorlist.centos.org/?release=#OS_VERSION#&arch=#ARCH#&repo=os"
+                    },
+                    "updates" => {
+                            "mirrorlist" => "http://mirrorlist.centos.org/?release=#OS_VERSION#&arch=#ARCH#&repo=updates"
+                    }
+            }
+    }
+
+    def info
+      {
+              :name       => :centos,
+              :full_name  => "CentOS",
+              :type       => :linux,
+              :versions   => ["5"]
+      }
+    end
+
+    def execute
+      adjust_partition_table
+
+      disk_path = build_with_appliance_creator( CENTOS_REPOS )  do |guestfs, guestfs_helper|
+        kernel_version = guestfs.ls("/lib/modules").first
+
+        @log.debug "Recreating initrd for #{kernel_version} kernel..."
+        guestfs.sh( "/sbin/mkinitrd -f -v --preload=mptspi /boot/initrd-#{kernel_version}.img #{kernel_version}" )
+        @log.debug "Initrd recreated."
+
+        @log.debug "Applying root password..."
+        guestfs.sh( "/usr/bin/passwd -d root" )
+        guestfs.sh( "/usr/sbin/usermod -p '#{@appliance_config.os.password.crypt((0...8).map{65.+(rand(25)).chr}.join)}' root" )
+        @log.debug "Password applied."
+      end
+
+      @log.info "Done."
+
+      disk_path
+    end
+
+    # https://bugzilla.redhat.com/show_bug.cgi?id=466275
+    def adjust_partition_table
+      @appliance_config.hardware.partitions['/boot'] = { 'root' => '/boot', 'size' => 0.1 } if @appliance_config.hardware.partitions['/boot'].nil?
+    end
+  end
+end

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

@@ -0,0 +1,66 @@
+# 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-build/plugins/os/base/rpm-based-os-plugin'
+require 'boxgrinder-build/plugins/os/base/kickstart'
+require 'boxgrinder-build/plugins/os/base/validators/rpm-dependency-validator'
+
+module BoxGrinder
+  class FedoraPlugin < RPMBasedOSPlugin
+
+    FEDORA_REPOS = {
+            "12" => {
+                    "base" => {
+                            "mirrorlist" => "http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-12&arch=#ARCH#"
+                    },
+                    "updates" => {
+                            "mirrorlist" => "http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f12&arch=#ARCH#"
+                    }
+            },
+            "11" => {
+                    "base" => {
+                            "mirrorlist" => "http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-11&arch=#ARCH#"
+                    },
+                    "updates" => {
+                            "mirrorlist" => "http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f11&arch=#ARCH#"
+                    }
+            },
+            "rawhide" => {
+                    "base" => {
+                            "mirrorlist" => "http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=#ARCH#"
+                    }
+            }
+
+    }
+
+    def info
+      {
+              :name       => :fedora,
+              :full_name  => "Fedora",
+              :type       => :linux,
+              :versions   => ["11", "12", "rawhide"]
+      }
+    end
+
+    def execute
+      build_with_appliance_creator( FEDORA_REPOS )
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+# 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-build/plugins/os/base/rpm-based-os-plugin'
+
+module BoxGrinder
+  class RHELPlugin < RPMBasedOSPlugin
+    def info
+      {
+              :name       => :rhel,
+              :full_name  => "Red Hat Enterprise Linux",
+              :type       => :linux,
+              :versions   => ["5"]
+      }
+    end
+
+    def build
+      raise "Build cannot be started until the plugin isn't initialized" if @initialized.nil?
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+# 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-build/managers/platform-plugin-manager'
+require 'boxgrinder-build/plugins/base-plugin'
+
+module BoxGrinder
+  class BasePlatformPlugin < BasePlugin
+    def self.inherited(klass)
+      PlatformPluginManager.instance << klass
+    end
+
+    alias_method :execute_original, :execute
+
+    def execute(args = nil)
+      raise "Conversion cannot be started before the plugin isn't initialized" if @initialized.nil?
+      execute_original(args)
+    end
+  end
+end