brightbox-boxgrinder-plugins 0.0.3 → 0.0.4

data/CHANGELOG

@@ -1,3 +1,9 @@
+v0.0.4
+
+* Remove sl plugin incorporated upstream
+* Bring URLs and documentation up to date
+* Upload images in Qcow compressed format
+
 v0.0.3
 
 * Switch dependencies to brightbox-cli

data/Manifest

@@ -5,6 +5,5 @@ README.md
 Rakefile
 lib/brightbox-boxgrinder-plugins.rb
 lib/delivery/bbcloud-delivery-plugin.rb
-lib/os/sl-plugin.rb
 lib/platform/bbcloud-platform-plugin.rb
 lib/platform/src/rc_local

data/README.md

@@ -4,11 +4,11 @@ This archive integrates the Boxgrinder project [boxgrinder.org](http://www.boxgr
 
 ### Supported OSes
 
-Brightbox supports all the OSs that Boxgrinder can generate and adds a plugin to generate Scientific Linux images - so you can get Enterprise Linux version 6 today.
+Brightbox supports all the OSs that Boxgrinder can generate.
 
 ### Requirements
 
-* A RPM based build machine - registering the boxgrinder appliance image with the Brightbox cloud works fine.
+* A RPM based build machine - use the current public Boxgrinder appliance registered on the Brightbox cloud
 * This plugin gem installed.
 
 ### Installing

data/Rakefile

@@ -30,7 +30,7 @@ Echoe.new("brightbox-boxgrinder-plugins") do |p|
   p.author = "Neil Wilson"
   p.email = "hello@brightbox.co.uk"
   p.summary = "Brightbox Cloud support for Boxgrinder"
-  p.url = "http://beta.brightbox.com"
+  p.url = "http://brightbox.com"
   p.runtime_dependencies = ['brightbox-cli']
 end
 

data/brightbox-boxgrinder-plugins.gemspec

@@ -1,25 +1,24 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{brightbox-boxgrinder-plugins}
-  s.version = "0.0.3"
+  s.name = "brightbox-boxgrinder-plugins"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Neil Wilson"]
-  s.date = %q{2011-10-13}
-  s.description = %q{Brightbox Cloud support for Boxgrinder}
-  s.email = %q{hello@brightbox.co.uk}
-  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.md", "lib/brightbox-boxgrinder-plugins.rb", "lib/delivery/bbcloud-delivery-plugin.rb", "lib/os/sl-plugin.rb", "lib/platform/bbcloud-platform-plugin.rb", "lib/platform/src/rc_local"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README.md", "Rakefile", "lib/brightbox-boxgrinder-plugins.rb", "lib/delivery/bbcloud-delivery-plugin.rb", "lib/os/sl-plugin.rb", "lib/platform/bbcloud-platform-plugin.rb", "lib/platform/src/rc_local", "brightbox-boxgrinder-plugins.gemspec"]
-  s.homepage = %q{http://beta.brightbox.com}
+  s.date = "2012-06-27"
+  s.description = "Brightbox Cloud support for Boxgrinder"
+  s.email = "hello@brightbox.co.uk"
+  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.md", "lib/brightbox-boxgrinder-plugins.rb", "lib/delivery/bbcloud-delivery-plugin.rb", "lib/platform/bbcloud-platform-plugin.rb", "lib/platform/src/rc_local"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README.md", "Rakefile", "lib/brightbox-boxgrinder-plugins.rb", "lib/delivery/bbcloud-delivery-plugin.rb", "lib/platform/bbcloud-platform-plugin.rb", "lib/platform/src/rc_local", "brightbox-boxgrinder-plugins.gemspec"]
+  s.homepage = "http://brightbox.com"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Brightbox-boxgrinder-plugins", "--main", "README.md"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{Brightbox Cloud}
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Brightbox Cloud support for Boxgrinder}
+  s.rubyforge_project = "Brightbox Cloud"
+  s.rubygems_version = "1.8.15"
+  s.summary = "Brightbox Cloud support for Boxgrinder"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/brightbox-boxgrinder-plugins.rb

@@ -19,4 +19,3 @@
 
 require 'delivery/bbcloud-delivery-plugin'
 require 'platform/bbcloud-platform-plugin'
-require 'os/sl-plugin'

data/lib/delivery/bbcloud-delivery-plugin.rb

@@ -21,9 +21,20 @@ require 'boxgrinder-build/plugins/base-plugin'
 
 module BoxGrinder
   class BbcloudDeliveryPlugin < BasePlugin
+
+    plugin :type => :delivery, :name => :bbcloud, :full_name => "Brightbox Cloud Image Registration Service"
+    def after_init
+      set_default_config_value('description', default_description)
+      set_default_config_value('name', default_name)
+      set_default_config_value('username', default_username)
+      set_default_config_value('mode', default_mode)
+      set_default_config_value('public', default_public)
+      validate_mode
+      validate_public
+    end
    
     def execute( type = :bbcloud )
-      @log.info "Adding '#{@appliance_config.name}' appliance to Brightbox Cloud..." 
+      @log.info "Adding '#{@plugin_config['name']}' appliance to Brightbox Cloud..." 
       @log.info "Using Brightbox account id #{account}"
       upload
       register_image
@@ -32,14 +43,14 @@ module BoxGrinder
     def upload
       @log.info "Uploading to #{ftp_hash['library_ftp_host']} with secure FTP"
       if system curl_command
-        @log.info "Appliance #{@appliance_config.name} uploaded."
+        @log.info "Appliance #{@plugin_config['name']} uploaded."
       else
         raise "An error occurred while uploading files."
       end
     end
 
     def register_image
-      @log.info "Registering appliance as #{image_id} under account #{account} with the name '#{appliance_name}'"
+      @log.info "Registering appliance as #{image_id} under account #{account} with the name '#{@plugin_config['name']}'"
       @log.info "Run 'brightbox-images show #{image_id}' to check registration progress"
     end
 
@@ -53,7 +64,7 @@ module BoxGrinder
     end
 
     def account
-      @account ||= @exec_helper.execute("brightbox-accounts -s list").split[0]
+      @account ||= @exec_helper.execute("brightbox-accounts -s list 2>/dev/null").split[0]
     rescue RuntimeError => e
       @log.error e.message
       raise PluginValidationError, "Make sure the that brightbox cloud API tools are installed. Use 'brightbox-config client_add' to add the api client details for your account." 
@@ -72,18 +83,49 @@ module BoxGrinder
     end
 
     def curl_command
-      "curl -# -u #{ftp_hash['library_ftp_user']}:#{ftp_hash['library_ftp_password']} --ftp-ssl-control -T #{disk_image} ftp://#{ftp_hash['library_ftp_host']}/incoming/#{target_name}"
+      "curl #{if ENV['INSECURE'] then "-k" end} -# -u #{ftp_hash['library_ftp_user']}:#{ftp_hash['library_ftp_password']} --ftp-ssl-control -T #{disk_image} ftp://#{ftp_hash['library_ftp_host']}/incoming/#{target_name}"
     end
     
-    def appliance_name
-      "#{@appliance_config.name}-#{@appliance_config.version}.#{@appliance_config.release}-#{@appliance_config.os.name}-#{@appliance_config.os.version}-#{current_platform}"
+    def default_name
+      @appliance_config.name
+    end
+
+    def default_description
+      @appliance_config.summary
+    end
+
+    def default_mode
+      'virtio'
+    end
+
+    def default_username
+      'brightbox'
+    end
+
+    def default_public
+      'false'
+    end
+
+    def validate_mode
+      case @plugin_config['mode']
+      when 'compatibility', 'virtio'
+      else
+        raise PluginValidationError, "Valid values for #{@plugin_info[:full_name]} plugin 'mode' option are 'compatibility' or 'virtio'"
+      end
+    end
+
+    def validate_public
+      case @plugin_config['public']
+      when 'true', 'false'
+      else
+        raise PluginValidationError, "Valid values for #{@plugin_info[:full_name]} plugin 'public' option are 'true' or 'false'"
+      end
     end
 
     def register_image_command
-      "brightbox-images register -a #{@appliance_config.hardware.arch} -s #{target_name} -n '#{appliance_name}' -d '#{@appliance_config.summary}'"
+      "brightbox-images register -a #{@appliance_config.hardware.arch} -s #{target_name} -n '#{@plugin_config['name']}' -d '#{@plugin_config['description']}' -u '#{@plugin_config['username']}' -m '#{@plugin_config['mode']}' -p '#{@plugin_config['public']}'"
     end
 
   end
 end
 
-plugin :class => BoxGrinder::BbcloudDeliveryPlugin, :type => :delivery, :name => :bbcloud, :full_name => "Brightbox Cloud Image Registration Service"

data/lib/platform/bbcloud-platform-plugin.rb

@@ -18,48 +18,48 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
 require 'boxgrinder-build/plugins/base-plugin'
-require 'boxgrinder-build/helpers/linux-helper'
 require 'tempfile'
 
 module BoxGrinder
   class BbcloudPlatformPlugin < BasePlugin
-    def after_init
-      register_deliverable(:disk => "#{deliverable_name}.gz")
-
-      register_supported_os('fedora', ['13', '14', '15'])
-      register_supported_os('centos', ['5'])
-      register_supported_os('rhel', ['5', '6'])
-      register_supported_os('sl', ['5', '6'])
-    end
+    plugin :type => :platform, :name => :bbcloud, :full_name => "Brightbox Cloud"
 
-    def deliverable_name
-      "#{@appliance_config.name}-#{@appliance_config.version}.#{@appliance_config.release}-#{@appliance_config.os.name}-#{@appliance_config.os.version}"
+    def after_init
+      register_deliverable(:disk => "#{deliverable_name}.qcow2")
+      set_default_config_value('username', default_user)
+      @appliance_config.packages |= %w{cloud-init} if has_cloud_init?
     end
 
     def execute
-      @linux_helper = LinuxHelper.new(:log => @log)
-
       @log.info "Converting #{@appliance_config.name} appliance image to use Brightbox metadata services"
 
-      @image_helper.convert_disk(@previous_deliverables.disk, 'raw', uncompressed_disk_name)
+      @log.debug "Using qemu-img to convert the image to qcow2 format..."
+      @image_helper.convert_disk(@previous_deliverables.disk, :qcow2, @deliverables.disk)
+      @log.debug "Conversion done."
 
-      @image_helper.customize([uncompressed_disk_name], :automount => true) do |guestfs, guestfs_helper|
-        upload_rc_local(guestfs)
+      @log.debug "Adding metadata customisations"
+      @image_helper.customize([@deliverables.disk], :automount => true) do |guestfs, guestfs_helper|
         add_default_user(guestfs)
-	disable_root_password(guestfs)
-        change_configuration(guestfs_helper)
+	disable_root_password(guestfs_helper)
+	set_default_timezone(guestfs_helper)
+        change_ssh_configuration(guestfs_helper)
+	if has_cloud_init?
+	  customise_cloud_init(guestfs_helper)
+	else
+	  update_rc_local(guestfs)
+	end
         execute_post(guestfs_helper)
       end
-
-      @log.info "Image converted to Brightbox format, compressing"
-      @exec_helper.execute("gzip --fast -v #{uncompressed_disk_name}")
-      @log.info "Disk compressed"
+      @log.debug "Added customisations"
     end
 
-    def uncompressed_disk_name
-      @uncompressed_name ||= File.join(File.dirname(@deliverables.disk), File.basename(@deliverables.disk, '.gz'))
+    def has_cloud_init?
+      @appliance_config.os.name == 'fedora' and @appliance_config.os.version >= '16'
     end
 
+    def customise_cloud_init(guestfs_helper)
+      guestfs_helper.sh("sed -i 's/^user: ec2-user$/user: #{@plugin_config['username']}/' /etc/cloud/cloud.cfg")
+    end
 
     def execute_post(guestfs_helper)
       if @appliance_config.post['bbcloud']
@@ -68,7 +68,7 @@ module BoxGrinder
         end
         @log.debug "Post commands from appliance definition file executed."
       else
-        @log.debug "No commands specified, skipping."
+        @log.debug "No Post commands specified, skipping."
       end
     end
 
@@ -76,41 +76,68 @@ module BoxGrinder
       "brightbox"
     end
 
+    def deliverable_name
+      "#{@appliance_config.name}-#{@appliance_config.version}.#{@appliance_config.release}-#{@appliance_config.os.name}-#{@appliance_config.os.version}"
+    end
+
     def add_default_user(guestfs)
-      @log.debug "Adding #{default_user} user..."
-      guestfs.sh("useradd #{default_user}")
-      guestfs.sh("echo -e '#{default_user}\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers")
-      @log.debug "User #{default_user} added."
+      @log.debug "Adding #{@plugin_config['username']} user..."
+      unless guestfs.fgrep(@plugin_config['username'], "/etc/passwd").empty?
+        @log.debug("#{@plugin_config['username']} already exists, skipping.")
+        return
+      end
+      guestfs.sh("useradd #{@plugin_config['username']}")
+      guestfs.sh("echo -e '#{@plugin_config['username']}\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers")
+      @log.debug "User #{@plugin_config['username']} added."
     end
 
-    def disable_root_password(guestfs)
+    def disable_root_password(guestfs_helper)
       @log.debug "Disabling root password"
-      guestfs.sh("usermod -L root")
-      @log.debug "root password disabled - use sudo from #{default_user} account"
+      guestfs_helper.sh("usermod -L root")
+      @log.info "root password disabled - use sudo from #{@plugin_config['username']} account"
     end
 
-    def upload_rc_local(guestfs)
-      @log.debug "Uploading '/etc/rc.local' file..."
+    def update_rc_local(guestfs)
+      @log.debug "Updating '/etc/rc.d/rc.local' file..."
       rc_local = Tempfile.new('rc_local')
-      rc_local << guestfs.read_file("/etc/rc.local") + File.read("#{File.dirname(__FILE__)}/src/rc_local")
+
+      if guestfs.exists("/etc/rc.d/rc.local") == 1
+        # We're appending
+        rc_local << guestfs.read_file("/etc/rc.d/rc.local")
+      else
+        # We're creating new file
+        rc_local << "#!/bin/bash\n\n"
+      end
+
+      rc_local << File.read("#{File.dirname(__FILE__)}/src/rc_local")
       rc_local.flush
 
-      guestfs.upload(rc_local.path, "/etc/rc.local")
+      guestfs.upload(rc_local.path, "/etc/rc.d/rc.local")
 
       rc_local.close
-      @log.debug "'/etc/rc.local' file uploaded."
     end
 
-    def change_configuration(guestfs_helper)
+    def change_ssh_configuration(guestfs_helper)
       guestfs_helper.augeas do
         # disable password authentication
         set("/etc/ssh/sshd_config", "PasswordAuthentication", "no")
 
         # disable root login
         set("/etc/ssh/sshd_config", "PermitRootLogin", "no")
+
+	# Switch off GSS Authentication
+        set("/etc/ssh/sshd_config", "GSSAPIAuthentication", "no")
+      end
+    end
+
+    def set_default_timezone(guestfs_helper)
+      guestfs_helper.augeas do
+        set("/etc/sysconfig/clock", "UTC", "True")
+        set("/etc/sysconfig/clock", "ZONE", "Etc/UTC")
       end
+      guestfs_helper.guestfs.cp("/usr/share/zoneinfo/UTC", "/etc/localtime")
     end
+
   end
 end
 
-plugin :class => BoxGrinder::BbcloudPlatformPlugin, :type => :platform, :name => :bbcloud, :full_name => "Brightbox Cloud"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: brightbox-boxgrinder-plugins
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Neil Wilson
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-13 00:00:00 +01:00
-default_executable: 
+date: 2012-06-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: brightbox-cli
@@ -44,7 +43,6 @@ extra_rdoc_files:
 - README.md
 - lib/brightbox-boxgrinder-plugins.rb
 - lib/delivery/bbcloud-delivery-plugin.rb
-- lib/os/sl-plugin.rb
 - lib/platform/bbcloud-platform-plugin.rb
 - lib/platform/src/rc_local
 files: 
@@ -55,12 +53,10 @@ files:
 - Rakefile
 - lib/brightbox-boxgrinder-plugins.rb
 - lib/delivery/bbcloud-delivery-plugin.rb
-- lib/os/sl-plugin.rb
 - lib/platform/bbcloud-platform-plugin.rb
 - lib/platform/src/rc_local
 - brightbox-boxgrinder-plugins.gemspec
-has_rdoc: true
-homepage: http://beta.brightbox.com
+homepage: http://brightbox.com
 licenses: []
 
 post_install_message: 
@@ -95,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: Brightbox Cloud
-rubygems_version: 1.3.7
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Brightbox Cloud support for Boxgrinder

data/lib/os/sl-plugin.rb

@@ -1,57 +0,0 @@
-#  Brightbox - Boxgrinder Scientific Linux OS Plugin
-#  Copyright (c) 2011, Brightbox Systems
-#  Author: Neil Wilson
-#
-# 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 3 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/rhel/rhel-plugin'
-
-module BoxGrinder
-  class ScientificLinuxPlugin < RHELPlugin
-   
-    SL_REPOS = {
-     "5" => {
-       "base" => {
-         "baseurl" => "http://ftp.scientificlinux.org/linux/scientific/#OS_VERSION#x/#BASE_ARCH#/SL/"
-        },
-       "updates" => {
-         "baseurl" => "http://ftp.scientificlinux.org/linux/scientific/#OS_VERSION#x/#BASE_ARCH#/updates/security/"
-        }
-      },
-     "6" => {
-       "base" => {
-         "baseurl" => "http://ftp.scientificlinux.org/linux/scientific/#OS_VERSION#x/#BASE_ARCH#/os/"
-        },
-       "updates" => {
-         "baseurl" => "http://ftp.scientificlinux.org/linux/scientific/#OS_VERSION#x/#BASE_ARCH#/updates/security/"
-        }
-      }
-    }
-
-
-    def after_init
-      super
-      register_supported_os('sl', ['5', '6'])
-    end
-
-    def execute(appliance_definition_file)
-      build_rhel(appliance_definition_file, SL_REPOS)
-    end
-
-  end
-end
-
-plugin :class => BoxGrinder::ScientificLinuxPlugin, :type => :os, :name => :sl, :full_name  => "Scientific Linux", :versions   => ["5", "6"]