boxgrinder-build 0.2.0 → 0.3.2

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

@@ -0,0 +1,98 @@
+# 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/helpers/exec-helper'
+require 'boxgrinder-build/helpers/plugin-helper'
+require 'logger'
+
+module BoxGrinder
+  class BasePlugin
+    def init(config, appliance_config, options = {})
+      @config           = config
+      @appliance_config = appliance_config
+      @options          = options
+
+      @log              = options[:log]           || Logger.new(STDOUT)
+      @exec_helper      = options[:exec_helper]   || ExecHelper.new( :log => @log )
+      @plugin_helper    = options[:plugin_helper] || PluginHelper.new( :log => @log )
+
+      @plugin_config    = {}
+
+      if self.respond_to?(:info)
+        @config_file = "#{ENV['HOME']}/.boxgrinder/plugins/#{self.info[:name]}"
+
+        read_plugin_config
+
+        @deliverables             = Hash.new({})
+        @deliverables[:disk]      = nil
+        @deliverables[:platform]  = self.info[:name]
+      end
+
+      after_init
+
+      @initialized = true
+
+      self
+    end
+
+    attr_reader :deliverables
+
+    def validate_plugin_config(fields = [], doc = nil)
+      more_info = doc.nil? ? '' : "See #{doc} for more info"
+
+      raise "Not valid configuration file for #{info[:name]} plugin. Please create valid '#{@config_file}' file. #{more_info}" if @plugin_config.nil?
+
+      fields.each do |field|
+        raise "Please specify a valid #{field} in plugin configuration file: '#{@config_file}'. #{more_info}" if @plugin_config[field].nil?
+      end
+    end
+
+    def execute(args = nil)
+      raise "Execute operation for #{self.class} plugin is not implemented"
+    end
+
+    def after_init
+    end
+
+    def set_default_config_value(key, value)
+      @plugin_config[key] = @plugin_config[key].nil? ? value : @plugin_config[key]
+    end
+
+    def read_plugin_config
+      return unless File.exists?(@config_file)
+
+      @log.debug "Reading configuration file for #{self.class.name}."
+
+      begin
+        @plugin_config = YAML.load_file(@config_file)
+      rescue
+        raise "An error occurred while reading configuration file #{@config_file} for #{self.class.name}. It is a valid YAML file?"
+      end
+    end
+
+    def customize(disk_path)
+      raise "Customizing cannot be started until the plugin isn't initialized" if @initialized.nil?
+
+      ApplianceCustomizeHelper.new(@config, @appliance_config, disk_path, :log => @log).customize do |guestfs, guestfs_helper|
+        yield guestfs, guestfs_helper
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+# 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/delivery-plugin-manager'
+require 'boxgrinder-build/plugins/base-plugin'
+
+module BoxGrinder
+  class BaseDeliveryPlugin < BasePlugin
+    alias_method :execute_original, :execute
+
+    def execute( deliverables, type)
+      raise "Delivery cannot be started before the plugin isn't initialized" if @initialized.nil?
+      raise "Not valid delivery type selected for #{info[:name]} plugin: #{type}. Available types: #{info[:type].join(" ")}" unless info[:type].include?(type)
+      
+      execute_original( deliverables, type )
+    end
+
+    def self.inherited(klass)
+      DeliveryPluginManager.instance << klass
+    end
+
+    def already_delivered?
+      false
+    end
+  end
+end

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

@@ -0,0 +1,57 @@
+require 'boxgrinder-build/plugins/delivery/base/base-delivery-plugin'
+
+module BoxGrinder
+  class LocalPlugin < BaseDeliveryPlugin
+    def info
+      {
+              :name       => :local,
+              :type       => [:local],
+              :full_name  => "Local file system"
+      }
+    end
+
+    def after_init
+      set_default_config_value('overwrite', true)
+      set_default_config_value('package', true)
+    end
+
+    def execute(deliverables, type = :local)      
+      validate_plugin_config( [ 'path' ], 'http://community.jboss.org/docs/DOC-15216' )
+
+      files = []
+
+      if @plugin_config['package']
+        files <<  PackageHelper.new(@config, @appliance_config, {:log => @log, :exec_helper => @exec_helper}).package(deliverables)
+      else
+        files << deliverables[:disk]
+
+        [:metadata, :other].each do |deliverable_type|
+          deliverables[deliverable_type].each_value do |file|
+            files << file
+          end
+        end
+      end
+
+      if @plugin_config['overwrite'] or !already_delivered?(files)
+        FileUtils.mkdir_p @plugin_config['path']
+
+        @log.debug "Copying files to destination..."
+
+        files.each do |file|
+          @log.debug "Copying #{file}..."
+          FileUtils.cp(file, @plugin_config['path'])
+        end
+        @log.info "Appliance delivered to #{@plugin_config['path']}."
+      else
+        @log.info "Appliance already delivered to #{@plugin_config['path']}."
+      end
+    end
+
+    def already_delivered?(files)
+      files.each do |file|
+        return false unless File.exists?("#{@plugin_config['path']}/#{File.basename(file)}")
+      end
+      true
+    end
+  end
+end

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

@@ -0,0 +1,133 @@
+# 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/delivery/base/base-delivery-plugin'
+require 'boxgrinder-build/plugins/delivery/s3/aws-helper'
+require 'AWS'
+require 'aws/s3'
+include AWS::S3
+
+module BoxGrinder
+  class S3Plugin < BaseDeliveryPlugin
+
+    def info
+      {
+              :name       => :s3,
+              :type       => [:cloudfront, :ami, :s3],
+              :full_name  => "Amazon Simple Storage Service (Amazon S3)"
+      }
+    end
+
+    def after_init
+      set_default_config_value('overwrite', false)
+    end
+
+    def execute(deliverables, type = :ami)
+      validate_plugin_config(['bucket', 'access_key', 'secret_access_key', 'path'])
+
+      case type
+        when :s3
+          upload_to_bucket(deliverables)
+        when :cloudfront
+          upload_to_bucket(deliverables, :public_read)
+        when :ami
+          raise "Not implemented!"
+          #bundle_image(deliverables)
+          #upload_image
+          #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']}'..."
+
+      begin
+        AWS::S3::Bucket.find(@plugin_config['bucket'])
+      rescue AWS::S3::NoSuchBucket
+        AWS::S3::Bucket.create(@plugin_config['bucket'])
+        retry
+      end
+
+      remote_path = "#{@plugin_config['path']}/#{File.basename(package)}"
+      size_b      = File.size(package)
+
+      unless S3Object.exists?(remote_path, @plugin_config['bucket']) or @plugin_config['overwrite']
+        @log.info "Uploading #{File.basename(package)} (#{size_b/1024/1024}MB)..."
+        AWS::S3::S3Object.store(remote_path, open(package), @plugin_config['bucket'], :access => permissions)
+      end
+
+      @log.info "Appliance #{@appliance_config.name} uploaded to S3."
+    end
+
+
+    def bundle_image(deliverables)
+      @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}")
+
+      @log.info "Bundling AMI finished."
+    end
+
+    def appliance_already_uploaded?
+      begin
+        bucket = Bucket.find(@aws_helper.aws_data['bucket_name'])
+      rescue
+        return false
+      end
+
+      manifest_location = @aws_helper.bucket_manifest_key(@appliance_config.name)
+      manifest_location = manifest_location[manifest_location.index("/") + 1, manifest_location.length]
+
+      for object in bucket.objects do
+        return true if object.key.eql?(manifest_location)
+      end
+
+      false
+    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']}'..."
+
+      @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")
+    end
+
+    def register_image
+      ami_info    = @aws_helper.ami_info(@appliance_config.name)
+
+      if ami_info
+        @log.info "Image is registered under id: #{ami_info.imageId}"
+        return
+      else
+        ami_info = @aws_helper.ec2.register_image(:image_location => @aws_helper.bucket_manifest_key(@appliance_config.name))
+        @log.info "Image successfully registered under id: #{ami_info.imageId}."
+      end
+    end
+
+  end
+end

data/lib/boxgrinder-build/{helpers/ssh-helper.rb → plugins/delivery/sftp/sftp-plugin.rb}

@@ -20,21 +20,50 @@
 
 require 'net/ssh'
 require 'net/sftp'
-require 'progressbar/progressbar'
-require 'boxgrinder-core/helpers/exec-helper'
+require 'progressbar'
+require 'boxgrinder-build/plugins/delivery/base/base-delivery-plugin'
+require 'boxgrinder-build/helpers/package-helper'
 
 module BoxGrinder
-  class SSHHelper
-    def initialize( ssh_options, options = {} )
-      @ssh_options    = ssh_options
+  class SFTPPlugin < BaseDeliveryPlugin
+    def info
+      {
+              :name       => :sftp,
+              :type       => [:sftp],
+              :full_name  => "SSH File Transfer Protocol"
+      }
+    end
 
-      @log            = options[:log]         || Logger.new(STDOUT)
-      @exec_helper    = options[:exec_helper] || ExecHelper.new( :log => @log )
+    def after_init
+      set_default_config_value('overwrite', false)
+      set_default_config_value('default_permissions', 0644)
+    end
+
+    def execute(deliverables, type = :sftp)
+      validate_plugin_config(['path', 'username', 'host'], 'CHANGEME')
+
+      #SSHValidator.new( @config ).validate
+
+      package = PackageHelper.new(@config, @appliance_config, {:log => @log, :exec_helper => @exec_helper}).package(deliverables)
+
+      @log.info "Uploading #{@appliance_config.name} appliance via SSH..."
+
+      begin
+        #TODO move to a block
+        connect
+        upload_files(@plugin_config['path'], {File.basename(package) => package})
+        disconnect
+
+        @log.info "Appliance #{@appliance_config.name} uploaded."
+      rescue => e
+        @log.error e
+        @log.error "An error occurred while uploading files."
+      end
     end
 
     def connect
-      @log.info "Connecting to #{@ssh_options['host']}..."
-      @ssh = Net::SSH.start( @ssh_options['host'], @ssh_options['username'], { :password => @ssh_options['password'] } )
+      @log.info "Connecting to #{@plugin_config['host']}..."
+      @ssh = Net::SSH.start(@plugin_config['host'], @plugin_config['username'], {:password => @plugin_config['password']})
     end
 
     def connected?
@@ -43,21 +72,26 @@ module BoxGrinder
     end
 
     def disconnect
-      @log.info "Disconnecting from #{@ssh_options['host']}..."
+      @log.info "Disconnecting from #{@plugin_config['host']}..."
       @ssh.close if connected?
       @ssh = nil
     end
 
-    def upload_files( path, files = {} )
-
+    def upload_files(path, files = {})
       return if files.size == 0
 
       raise "You're not connected to server" unless connected?
 
+      @log.debug "Files to upload:"
+
+      files.each do |remote, local|
+        @log.debug "#{local} => #{remote}"
+      end
+
       global_size = 0
 
       files.each_value do |file|
-        global_size += File.size( file )
+        global_size += File.size(file)
       end
 
       global_size_kb = global_size / 1024
@@ -66,36 +100,31 @@ module BoxGrinder
       @log.info "#{files.size} files to upload (#{global_size_mb > 0 ? global_size_mb.to_s + "MB" : global_size_kb > 0 ? global_size_kb.to_s + "kB" : global_size.to_s})"
 
       @ssh.sftp.connect do |sftp|
-
         begin
-          sftp.stat!( path )
+          sftp.stat!(path)
         rescue Net::SFTP::StatusException => e
           raise unless e.code == 2
-          if @ssh_options['sftp_create_path']
-            @ssh.exec!( "mkdir -p #{path}" )
-          else
-            raise
-          end
+          @ssh.exec!("mkdir -p #{path}")
         end
 
         nb = 0
 
         files.each do |key, local|
-          name       = File.basename( local )
+          name       = File.basename(local)
           remote     = "#{path}/#{key}"
-          size_b     = File.size( local )
+          size_b     = File.size(local)
           size_kb    = size_b / 1024
           nb_of      = "#{nb += 1}/#{files.size}"
 
           begin
-            sftp.stat!( remote )
+            sftp.stat!(remote)
 
-            unless @ssh_options['sftp_overwrite']
+            unless @plugin_config['overwrite']
 
               local_md5_sum   = `md5sum #{local} | awk '{ print $1 }'`.strip
-              remote_md5_sum  = @ssh.exec!( "md5sum #{remote} | awk '{ print $1 }'" ).strip
+              remote_md5_sum  = @ssh.exec!("md5sum #{remote} | awk '{ print $1 }'").strip
 
-              if (local_md5_sum.eql?( remote_md5_sum ))
+              if (local_md5_sum.eql?(remote_md5_sum))
                 @log.info "#{nb_of} #{name}: files are identical (md5sum: #{local_md5_sum}), skipping..."
                 next
               end
@@ -105,16 +134,16 @@ module BoxGrinder
             raise unless e.code == 2
           end
 
-          @ssh.exec!( "mkdir -p #{File.dirname( remote ) }" )
+          @ssh.exec!("mkdir -p #{File.dirname(remote) }")
 
-          pbar = ProgressBar.new( "#{nb_of} #{name}", size_b )
+          pbar = ProgressBar.new("#{nb_of} #{name}", size_b)
           pbar.file_transfer_mode
 
-          sftp.upload!( local, remote ) do |event, uploader, *args|
+          sftp.upload!(local, remote) do |event, uploader, * args|
             case event
               when :open then
               when :put then
-                pbar.set( args[1] )
+                pbar.set(args[1])
               when :close then
               when :mkdir then
               when :finish then
@@ -122,19 +151,9 @@ module BoxGrinder
             end
           end
 
-          sftp.setstat(remote, :permissions => @ssh_options['sftp_default_permissions'])
-
+          sftp.setstat(remote, :permissions => @plugin_config['default_permissions'])
         end
       end
     end
-
-    def createrepo( path, directories = [] )
-      raise "You're not connected to server" unless connected?
-
-      directories.each do |directory|
-        @log.info "Refreshing repository information in #{directory}..."
-        @ssh.exec!( "createrepo #{path}/#{directory}" )
-      end
-    end
   end
-end
+end

data/lib/boxgrinder-build/{appliance-kickstart.rb → plugins/os/base/kickstart.rb}

@@ -18,59 +18,75 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
-require "fileutils"
-require 'rake/tasklib'
+require 'fileutils'
 require 'yaml'
 require 'erb'
 
 module BoxGrinder
 
-  class ApplianceKickstart < Rake::TaskLib
+  class Kickstart
 
-    def initialize( config, appliance_config, options = {} )
+    def initialize(config, appliance_config, repos, options = {})
       @config           = config
+      @repos            = repos
       @appliance_config = appliance_config
       @log              = options[:log] || Logger.new(STDOUT)
+    end
+
+    def create
+      FileUtils.mkdir_p @appliance_config.path.dir.raw.build
 
-      define_tasks
+      template = "#{File.dirname(__FILE__)}/src/appliance.ks.erb"
+      kickstart = ERB.new(File.read(template)).result(build_definition.send(:binding))
+      File.open(@appliance_config.path.file.raw.kickstart, 'w') { |f| f.write(kickstart) }
     end
 
     def build_definition
-      definition = { }
+      definition = {}
+
+      definition['appliance_config']  = @appliance_config
 
-      definition['partitions']      = @appliance_config.hardware.partitions.values
+      #definition['partitions']      = @appliance_config.hardware.partitions.values
       definition['name']            = @appliance_config.name
       definition['arch']            = @appliance_config.hardware.arch
       definition['appliance_names'] = @appliance_config.appliances
       definition['repos']           = []
 
-      appliance_definition          = @appliance_config.definition
+#      appliance_definition          = @image_config.definition
+#
+#      if SUPPORTED_DESKTOP_TYPES.include?( appliance_definition['desktop'] )
+#        definition['graphical'] = true
+#
+#        # default X package groups
+#        definition['packages'] = [ "@base-x", "@base", "@core", "@fonts", "@input-methods", "@admin-tools", "@dial-up", "@hardware-support", "@printing" ]
+#
+#        #selected desktop environment
+#        definition['packages'] += [ "@#{appliance_definition['desktop']}-desktop" ]
+#      else
+#        definition['graphical'] = false
+#        definition['packages']  = []
+#      end
 
-      if SUPPORTED_DESKTOP_TYPES.include?( appliance_definition['desktop'] )
-        definition['graphical'] = true
+      definition['graphical'] = false
+      definition['packages']  = []
 
-        # default X package groups
-        definition['packages'] = [ "@base-x", "@base", "@core", "@fonts", "@input-methods", "@admin-tools", "@dial-up", "@hardware-support", "@printing" ]
+      definition['packages'] += @appliance_config.packages.includes
 
-        #selected desktop environment
-        definition['packages'] += [ "@#{appliance_definition['desktop']}-desktop" ]
-      else
-        definition['graphical'] = false
-        definition['packages']  = []
+      @appliance_config.packages.excludes do |package|
+        definition['packages'].push("-#{package}")
       end
 
-      definition['packages'] += @appliance_config.packages
-
       # defautlt filesystem
       definition['fstype'] = "ext3"
 
       # fix for F12; this is needed because of selinux management in appliance-creator
       if @appliance_config.os.name.eql?("fedora")
+        definition['packages'].push("kernel", "passwd")
         case @appliance_config.os.version.to_s
           when "12" then
             definition['packages'].push "system-config-firewall-base"
-            # default filesystem for fedora 12
-            #definition['fstype'] = "ext4"
+          # default filesystem for fedora 12
+          #definition['fstype'] = "ext4"
           when "11" then
             definition['packages'].push "lokkit"
         end
@@ -78,8 +94,8 @@ module BoxGrinder
 
       definition['root_password'] = @appliance_config.os.password
 
-      def definition.method_missing(sym, *args)
-        self[ sym.to_s ]
+      def definition.method_missing(sym, * args)
+        self[sym.to_s]
       end
 
       cost = 40
@@ -92,7 +108,7 @@ module BoxGrinder
           urltype = 'baseurl'
         end
 
-        url = repo[urltype].gsub( /#ARCH#/, @appliance_config.hardware.arch )
+        url = repo[urltype].gsub(/#ARCH#/, @appliance_config.hardware.arch).gsub(/#OS_VERSION#/, @appliance_config.os.version).gsub(/#OS_NAME#/, @appliance_config.os.name)
 
         repo_def = "repo --name=#{repo['name']} --cost=#{cost} --#{urltype}=#{url}"
         repo_def += " --excludepkgs=#{repo['excludes'].join(',')}" unless repo['excludes'].nil? or repo['excludes'].empty?
@@ -105,39 +121,13 @@ module BoxGrinder
       definition
     end
 
-    def define_tasks
-      directory @appliance_config.path.dir.raw.build
-
-      file @appliance_config.path.file.raw.config => @appliance_config.path.dir.raw.build do
-        File.open( @appliance_config.path.file.raw.config, "w") {|f| f.write( @appliance_config.to_yaml ) } unless File.exists?( @appliance_config.path.file.raw.config )
-      end
-
-      task "appliance:#{@appliance_config.name}:config" do
-        if File.exists?( @appliance_config.path.file.raw.config )
-          unless @appliance_config.eql?( YAML.load_file( @appliance_config.path.file.raw.config ) )
-            FileUtils.rm_rf appliance_build_dir
-          end
-        end
-      end
-
-      file @appliance_config.path.file.raw.kickstart => [ @appliance_config.path.file.raw.config ] do
-        template = File.dirname( __FILE__ ) + "/erb/appliance.ks.erb"
-        kickstart = ERB.new( File.read( template ) ).result( build_definition.send( :binding ) )
-        File.open( @appliance_config.path.file.raw.kickstart, 'w' ) {|f| f.write( kickstart ) }
-      end
-
-      #desc "Build kickstart for #{File.basename( @appliance_config.name, '-appliance' )} appliance"
-      task "appliance:#{@appliance_config.name}:kickstart" => [ "appliance:#{@appliance_config.name}:config", @appliance_config.path.file.raw.kickstart ]
-
-    end
-
     def valid_repos
-      os_repos = REPOS[@appliance_config.os.name][@appliance_config.os.version]
+      os_repos = @repos[@appliance_config.os.version]
 
       repos = Array.new
 
-      for type in [ "base", "updates" ]
-        unless os_repos[type].nil?
+      for type in ["base", "updates"]
+        unless os_repos.nil? or os_repos[type].nil?
 
           mirrorlist = os_repos[type]['mirrorlist']
           baseurl = os_repos[type]['baseurl']
@@ -145,9 +135,9 @@ module BoxGrinder
           name = "#{@appliance_config.os.name}-#{@appliance_config.os.version}-#{type}"
 
           if mirrorlist.nil?
-            repos.push({ "name" => name, "baseurl" => baseurl })
+            repos.push({"name" => name, "baseurl" => baseurl})
           else
-            repos.push({ "name" => name, "mirrorlist" => mirrorlist })
+            repos.push({"name" => name, "mirrorlist" => mirrorlist})
           end
         end
       end