corl 0.4.1 → 0.4.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: corl
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-23 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nucleon
-  requirement: &4925940 !ruby/object:Gem::Requirement
+  requirement: &8964100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,32 +21,32 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *4925940
+  version_requirements: *8964100
 - !ruby/object:Gem::Dependency
-  name: sshkey
-  requirement: &4948820 !ruby/object:Gem::Requirement
+  name: fog
+  requirement: &8963100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.20'
   type: :runtime
   prerelease: false
-  version_requirements: *4948820
+  version_requirements: *8963100
 - !ruby/object:Gem::Dependency
-  name: fog
-  requirement: &4946120 !ruby/object:Gem::Requirement
+  name: unf
+  requirement: &8962060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.20'
+        version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *4946120
+  version_requirements: *8962060
 - !ruby/object:Gem::Dependency
   name: facter
-  requirement: &4943120 !ruby/object:Gem::Requirement
+  requirement: &8961060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *4943120
+  version_requirements: *8961060
 - !ruby/object:Gem::Dependency
   name: hiera
-  requirement: &4959260 !ruby/object:Gem::Requirement
+  requirement: &8959780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *4959260
+  version_requirements: *8959780
 - !ruby/object:Gem::Dependency
   name: puppet
-  requirement: &4957380 !ruby/object:Gem::Requirement
+  requirement: &8957320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *4957380
+  version_requirements: *8957320
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &4955380 !ruby/object:Gem::Requirement
+  requirement: &8954800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *4955380
+  version_requirements: *8954800
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &4544900 !ruby/object:Gem::Requirement
+  requirement: &8952820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *4544900
+  version_requirements: *8952820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &4542800 !ruby/object:Gem::Requirement
+  requirement: &8951080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '2.10'
   type: :development
   prerelease: false
-  version_requirements: *4542800
+  version_requirements: *8951080
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &4537280 !ruby/object:Gem::Requirement
+  requirement: &8944580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *4537280
+  version_requirements: *8944580
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &4657760 !ruby/object:Gem::Requirement
+  requirement: &8943360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +131,7 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *4657760
+  version_requirements: *8943360
 description: Framework that provides a simple foundation for growing organically in
   the cloud
 email: adrian.webb@coralnexus.com
@@ -164,45 +164,52 @@ files:
 - bootstrap/os/ubuntu/01_git.sh
 - bootstrap/os/ubuntu/05_ruby.sh
 - bootstrap/os/ubuntu/06_puppet.sh
+- bootstrap/os/ubuntu/09_nucleon.sh
 - bootstrap/os/ubuntu/10_corl.sh
 - corl.gemspec
+- lib/CORL/action/authorize.rb
 - lib/CORL/action/bootstrap.rb
+- lib/CORL/action/destroy.rb
 - lib/CORL/action/exec.rb
 - lib/CORL/action/image.rb
 - lib/CORL/action/images.rb
 - lib/CORL/action/lookup.rb
 - lib/CORL/action/machines.rb
 - lib/CORL/action/provision.rb
+- lib/CORL/action/regions.rb
 - lib/CORL/action/seed.rb
 - lib/CORL/action/spawn.rb
+- lib/CORL/action/ssh.rb
 - lib/CORL/action/start.rb
 - lib/CORL/action/stop.rb
 - lib/CORL/configuration/file.rb
 - lib/CORL/event/puppet.rb
 - lib/CORL/extension/puppetloader.rb
-- lib/CORL/machine/fog.rb
+- lib/CORL/machine/aws.rb
 - lib/CORL/machine/physical.rb
+- lib/CORL/machine/rackspace.rb
 - lib/CORL/network/default.rb
 - lib/CORL/node/aws.rb
-- lib/CORL/node/google.rb
 - lib/CORL/node/local.rb
 - lib/CORL/node/rackspace.rb
 - lib/CORL/provisioner/puppetnode.rb
 - lib/CORL/provisioner/puppetnode/resource.rb
 - lib/CORL/provisioner/puppetnode/resource_group.rb
 - lib/CORL/template/environment.rb
+- lib/core/errors.rb
 - lib/core/facade.rb
 - lib/core/mixin/action/keypair.rb
 - lib/core/mixin/lookup.rb
+- lib/core/mod/fog_aws_server.rb
 - lib/core/mod/hiera_backend.rb
 - lib/core/plugin/action.rb
 - lib/core/plugin/configuration.rb
-- lib/core/plugin/fog.rb
+- lib/core/plugin/fog_machine.rb
+- lib/core/plugin/fog_node.rb
 - lib/core/plugin/machine.rb
 - lib/core/plugin/network.rb
 - lib/core/plugin/node.rb
 - lib/core/plugin/provisioner.rb
-- lib/core/util/ssh.rb
 - lib/corl.rb
 - lib/facter/corl_config_ready.rb
 - lib/facter/corl_exists.rb

data/lib/CORL/node/google.rb

@@ -1,111 +0,0 @@
-
-module CORL
-module Node
-class Google < Node::Fog
- 
-  #-----------------------------------------------------------------------------
-  # Node plugin interface
-  
-  #-----------------------------------------------------------------------------
-  # Checks
-  
-  def usable_image?(image)
-    image.status == 'READY' && ! image.description.match(/DEPRECATED/i)
-  end
-  
-  #-----------------------------------------------------------------------------
-  # Property accessors / modifiers
-  
-  def project_name=project_name
-    myself[:project_name] = project_name
-  end
-  
-  def project_name
-    myself[:project_name]
-  end
-  
-  #---
-  
-  def regions
-    [
-      'us-central1-a',
-      'us-central1-b',
-      'europe-west1-a',
-      'europe-west1-b'     
-    ]
-  end
-  
-  #-----------------------------------------------------------------------------
-  # Settings groups
-    
-  def machine_config
-    super do |config|          
-      config.import({ 
-        :provider => 'google'
-      })
-      
-      config[:google_project]      = project_name if project_name
-      config[:google_client_email] = api_user if api_user
-      config[:google_key_location] = api_key if api_key
-    end
-  end
-  
-  #-----------------------------------------------------------------------------
-  # Node operations
-  
-  def create(options = {})
-    super do |op, config|
-      if op == :config
-        config[:private_key_path] = private_key if private_key
-        config[:public_key_path]  = public_key if public_key
-        
-        config.defaults({
-          :name         => hostname,
-          :machine_type => machine_type,
-          :image_name   => image
-        })
-      end
-    end
-  end
-  
-  #-----------------------------------------------------------------------------
-  # Utilities
-  
-  def machine_type_id(machine_type)
-    machine_type.name
-  end
-  
-  #---
-  
-  def render_machine_type(machine_type)
-    sprintf("[  %20s  ][ VCPUS: %2i ] %-55s ( RAM: %6iMB | DISK: %3iGB )  ( MAX DISKS: %2i | MAX STORAGE: %6iGB )", 
-      machine_type_id(machine_type), 
-      machine_type.guest_cpus, 
-      machine_type.description, 
-      machine_type.memory_mb, 
-      machine_type.image_space_gb, 
-      machine_type.maximum_persistent_disks, 
-      machine_type.maximum_persistent_disks_size
-    )
-  end
-  
-  #---
-  
-  def image_id(image)
-    image.name
-  end
-  
-  #---
-  
-  def render_image(image)
-    sprintf("[  %40s  ][ %10s ] %s - %s", image_id(image), image.status, image.description, image.project)
-  end
-  
-  #---
-  
-  def image_search_text(image)
-    sprintf("%s %s %s %s", image.name, image.description, image.status, image.project)  
-  end
-end
-end
-end

data/lib/core/util/ssh.rb

@@ -1,286 +0,0 @@
-
-module CORL
-module Util
-class SSH < Nucleon::Core
-  
-  #-----------------------------------------------------------------------------
-  # User key home
-  
-  @@key_path = nil
-  
-  #---
-  
-  def self.key_path
-    unless @@key_path
-      home_path  = ( ENV['USER'] == 'root' ? '/root' : ENV['HOME'] ) # In case we are using sudo
-      @@key_path = File.join(home_path, '.ssh')
-    
-      FileUtils.mkdir(@@key_path) unless File.directory?(@@key_path)
-    end
-    @@key_path
-  end
-  
-  #-----------------------------------------------------------------------------
-  # Instance generators
-  
-  def self.generate(options = {})
-    config = Config.ensure(options)
-    
-    private_key  = config.get(:private_key, nil)
-    original_key = nil
-    key_comment  = config.get(:comment, '')    
-    
-    if private_key.nil?
-      key_type    = config.get(:type, "RSA")
-      key_bits    = config.get(:bits, 2048)
-      passphrase  = config.get(:passphrase, nil)
-    
-      key_data = SSHKey.generate(
-        :type       => key_type, 
-        :bits       => key_bits, 
-        :comment    => key_comment, 
-        :passphrase => passphrase
-      )
-      is_new = true
-      
-    else
-      if private_key.include?('PRIVATE KEY')
-        original_key = private_key   
-      else
-        original_key = Disk.read(private_key)
-      end
-      
-      key_data = SSHKey.new(original_key, :comment => key_comment) if original_key
-      is_new   = false
-    end
-    
-    return nil unless key_data && ! key_data.ssh_public_key.empty?
-    Keypair.new(key_data, is_new, original_key)
-  end
-  
-  #-----------------------------------------------------------------------------
-  # Checks
-  
-  def self.valid?(public_ssh_key)
-    SSHKey.valid_ssh_public_key?(public_ssh_key)
-  end
-  
-  #-----------------------------------------------------------------------------
-  # Keypair interface
-    
-  class Keypair
-    attr_reader :type, :private_key, :encrypted_key, :public_key, :ssh_key
-    
-    def initialize(key_data, is_new, original_key)
-      @type          = key_data.type
-      @private_key   = key_data.private_key
-      @encrypted_key = is_new ? key_data.encrypted_private_key : original_key
-      @public_key    = key_data.public_key
-      @ssh_key       = key_data.ssh_public_key
-    end
-    
-    #---
-    
-    def store(key_path = nil, key_base = 'id')
-      key_path         = SSH.key_path if key_path.nil?
-      private_key_file = File.join(key_path, "#{key_base}_#{type.downcase}")
-      public_key_file  = File.join(key_path, "#{key_base}_#{type.downcase}.pub")
-      
-      private_success = Disk.write(private_key_file, encrypted_key)
-      FileUtils.chmod(0600, private_key_file) if private_success
-      
-      public_success  = Disk.write(public_key_file, ssh_key)
-      
-      if private_success && public_success
-        return { :private_key => private_key_file, :public_key => public_key_file }
-      end
-      false
-    end
-  end
-  
-  #-----------------------------------------------------------------------------
-  # SSH Execution interface
-  
-  @@sessions = {}
-  
-  #---
-  
-  def self.session_id(hostname, user)
-    "#{hostname}-#{user}"  
-  end
-  
-  #---
-  
-  def self.session(hostname, user, port = 22, private_key = nil, reset = false, options = {})
-    require 'net/ssh'
-    
-    ssh_options = Config.new({
-      :user_known_hosts_file => [ File.join(key_path, 'known_hosts'), File.join(key_path, 'known_hosts2') ],
-      :key_data              => [],
-      :keys_only             => false,
-      :auth_methods          => [ 'publickey' ],
-      :paranoid              => :very
-    }).import(options)
-    
-    ssh_options[:port] = port
-    ssh_options[:keys] = private_key.nil? ? [] : [ private_key ]
-    
-    session_id = session_id(hostname, user)
-    
-    if reset || ! @@sessions.has_key?(session_id)
-      @@sessions[session_id] = Net::SSH.start(hostname, user, ssh_options.export)
-    end
-    yield(@@sessions[session_id]) if block_given? && @@sessions[session_id]
-    @@sessions[session_id] 
-  end
-  
-  def self.init_session(hostname, user, port = 22, private_key = nil, options = {})
-    session(hostname, user, port, private_key, true, options)  
-  end
-  
-  #---
-  
-  def self.close(hostname = nil, user = nil)
-    if hostname && user.nil? # Assume we entered a session id
-      if @@sessions.has_key?(hostname)
-        @@sessions[hostname].close
-        @@sessions.delete(hostname)  
-      end
-      
-    elsif hostname && user # Generate session id from args
-      session_id = session_id(hostname, user)
-      
-      if @@sessions.has_key?(session_id)
-        @@sessions[session_id].close
-        @@sessions.delete(session_id)  
-      end
-      
-    else # Close all connections
-      @@sessions.keys.each do |id|
-        @@sessions[id].close
-        @@sessions.delete(id)      
-      end
-    end
-  end
-  
-  #---
-  
-  def self.exec(hostname, user, commands)
-    results = []
-        
-    begin
-      session(hostname, user) do |ssh|
-        Data.array(commands).each do |command|
-          command = command.flatten.join(' ') if command.is_a?(Array)
-          command = command.to_s
-          result  = Shell::Result.new(command)
-              
-          ssh.open_channel do |ssh_channel|
-            ssh_channel.request_pty
-            ssh_channel.exec(command) do |channel, success|
-              unless success
-                raise "Could not execute command: #{command.inspect}"
-              end
-
-              channel.on_data do |ch, data|
-                result.append_output(data)
-                yield(:output, command, data) if block_given?
-              end
-
-              channel.on_extended_data do |ch, type, data|
-                next unless type == 1
-                result.append_errors(data)
-                yield(:error, command, data) if block_given?
-              end
-
-              channel.on_request('exit-status') do |ch, data|
-                result.status = data.read_long
-              end
-
-              channel.on_request('exit-signal') do |ch, data|
-                result.status = 255
-              end
-            end
-          end
-          ssh.loop              
-          results << result
-        end
-      end
-    rescue Net::SSH::HostKeyMismatch => error
-      error.remember_host!
-      sleep 0.2
-      retry
-    end
-    results  
-  end
-  
-  #---
-  
-  def self.download(hostname, user, remote_path, local_path, options = {})
-    config = Config.ensure(options)
-    
-    require 'net/scp'
-    
-    # Accepted options:
-    # * :recursive - the +remote+ parameter refers to a remote directory, which
-    # should be downloaded to a new directory named +local+ on the local
-    # machine.
-    # * :preserve - the atime and mtime of the file should be preserved.
-    # * :verbose - the process should result in verbose output on the server
-    # end (useful for debugging).
-    #
-    config.init(:recursive, true)
-    config.init(:preserve, true)
-    config.init(:verbose, true)
-    
-    blocking = config.delete(:blocking, true)
-    
-    session(hostname, user) do |ssh|
-      if blocking
-        ssh.scp.download!(remote_path, local_path, config.export) do |ch, name, received, total|
-          yield(name, received, total) if block_given?
-        end
-      else
-        ssh.scp.download(remote_path, local_path, config.export)
-      end
-    end
-  end
-  
-  #---
-  
-  def self.upload(hostname, user, local_path, remote_path, options = {})
-    config = Config.ensure(options)
-    
-    require 'net/scp'
-    
-    # Accepted options:
-    # * :recursive - the +local+ parameter refers to a local directory, which
-    # should be uploaded to a new directory named +remote+ on the remote
-    # server.
-    # * :preserve - the atime and mtime of the file should be preserved.
-    # * :verbose - the process should result in verbose output on the server
-    # end (useful for debugging).
-    # * :chunk_size - the size of each "chunk" that should be sent. Defaults
-    # to 2048. Changing this value may improve throughput at the expense
-    # of decreasing interactivity.
-    #
-    config.init(:recursive, true)
-    config.init(:preserve, true)
-    config.init(:verbose, true)
-    config.init(:chunk_size, 2048)
-    
-    blocking = config.delete(:blocking, true)
-    
-    session(hostname, user) do |ssh|
-      if blocking
-        ssh.scp.upload!(local_path, remote_path, config.export) do |ch, name, sent, total|
-          yield(name, sent, total) if block_given?
-        end
-      else
-        ssh.scp.upload(local_path, remote_path, config.export)
-      end
-    end
-  end
-end
-end
-end