corl 0.5.3 → 0.5.4

data/lib/CORL/node/rackspace.rb

@@ -1,59 +1,59 @@
 
 module CORL
 module Node
-class Rackspace < Fog
- 
+class Rackspace < FogBase
+
   #-----------------------------------------------------------------------------
   # Node plugin interface
-  
+
   def normalize(reload)
     super do
       region_info.import({
         :dfw => 'Dallas',
         :ord => 'Chicago',
-        :lon => 'London (for UK accounts)'  
+        :lon => 'London (for UK accounts)'
       })
       # Return machine provider
       :rackspace
     end
   end
-      
+
   #-----------------------------------------------------------------------------
   # Checks
-  
+
   def usable_image?(image)
     image.state != 'DELETED'
   end
-  
+
   #-----------------------------------------------------------------------------
   # Property accessors / modifiers
-  
+
   #-----------------------------------------------------------------------------
   # Settings groups
-    
+
   def machine_config
     super do |config|
-      config.import({ 
-        :provider         => 'rackspace', 
+      config.import({
+        :provider         => 'rackspace',
         :version          => :v2,
         :rackspace_region => region
       })
-    
+
       config[:rackspace_username] = api_user if api_user
       config[:rackspace_api_key]  = api_key if api_key
       config[:rackspace_auth_url] = auth_url if auth_url
     end
   end
-  
+
   #---
-  
+
   def create_config
-    { :name => hostname, :flavor_id => machine_type, :image_id => image }  
+    { :name => hostname, :flavor_id => machine_type, :image_id => image }
   end
-  
+
   #-----------------------------------------------------------------------------
   # Node operations
-  
+
   def create(options = {})
     super do |op, config|
       if op == :config
@@ -61,9 +61,9 @@ class Rackspace < Fog
       end
     end
   end
-  
+
   #---
-  
+
   def start(options = {})
     super do |op, config|
       if op == :config
@@ -71,30 +71,30 @@ class Rackspace < Fog
       end
     end
   end
-  
+
   #-----------------------------------------------------------------------------
   # Utilities
-  
+
   def render_machine_type(machine_type)
-    sprintf("%-30s  %-35s  [ VCPUS: %-5s ] ( RAM: %6sMB | DISK: %4sGB )", 
+    sprintf("%-30s  %-35s  [ VCPUS: %-5s ] ( RAM: %6sMB | DISK: %4sGB )",
       purple(machine_type_id(machine_type)),
-      yellow(machine_type.name), 
-      blue(machine_type.vcpus.to_s),       
-      blue(machine_type.ram.to_s), 
+      yellow(machine_type.name),
+      blue(machine_type.vcpus.to_s),
+      blue(machine_type.ram.to_s),
       blue(machine_type.disk.to_s)
     )
   end
-  
+
   #---
-  
+
   def render_image(image)
     sprintf("%-47s [ %-10s ]   %s", purple(image_id(image)), blue(image.state), yellow(image.name))
   end
-  
+
   #---
-  
+
   def image_search_text(image)
-    sprintf("%s %s %s", image_id(image), image.name, image.state)  
+    sprintf("%s %s %s", image_id(image), image.name, image.state)
   end
 end
 end

data/lib/core/mod/fog_rackspace_server.rb

@@ -0,0 +1,29 @@
+module Fog
+module Compute
+class RackspaceV2
+class Server
+
+  def setup(credentials = {})
+    requires :ssh_ip_address, :identity, :public_key, :username
+
+    commands = [
+      %{mkdir .ssh},
+      %{echo "#{public_key}" >> ~/.ssh/authorized_keys},
+      password_lock,
+      %{echo "#{Fog::JSON.encode(attributes)}" >> ~/attributes.json},
+      %{echo "#{Fog::JSON.encode(metadata)}" >> ~/metadata.json}
+    ]
+    commands.compact
+
+    @password = nil if password_lock
+
+    Fog::SSH.new(ssh_ip_address, username, credentials).run(commands)
+
+  rescue Errno::ECONNREFUSED, Net::SSH::Disconnect
+    sleep(1)
+    retry
+  end
+end
+end
+end
+end

data/lib/core/plugin/fog_machine.rb

@@ -5,146 +5,147 @@ nucleon_require(File.dirname(__FILE__), :machine)
 
 module CORL
 module Machine
-class Fog < Nucleon.plugin_class(:CORL, :machine)
-  
+class FogBase < Nucleon.plugin_class(:CORL, :machine)
+
   include Mixin::Machine::SSH
 
   #-----------------------------------------------------------------------------
   # Machine plugin interface
-  
+
   def normalize(reload)
     super
     myself.plugin_name = '' if myself.plugin_provider == myself.plugin_name.to_sym
   end
- 
+
   #-----------------------------------------------------------------------------
   # Checks
-  
+
   def created?
     server && ! server.state != 'DELETED'
   end
-  
+
   #---
-  
+
   def running?
     created? && server.ready?
   end
-   
+
   #-----------------------------------------------------------------------------
   # Property accessors / modifiers
-  
+
   def set_connection
     logger.info("Initializing Fog Compute connection to cloud hosting provider")
     logger.debug("Compute settings: #{export.inspect}")
-    
+
     ENV['DEBUG'] = 'true' if CORL.log_level == :debug
-    
+
     require 'fog'
-            
+    yield if block_given?
+
     myself.compute = ::Fog::Compute.new(export)
   end
   protected :set_connection
-  
+
   #---
-  
+
   def compute=compute
     @compute = compute
   end
-  
+
   def compute
     set_connection unless @compute
     @compute
   end
-  
+
   #---
-  
+
   def server=id
     @server = nil
-    
+
     if id.is_a?(String)
       @server = compute.servers.get(id) unless id.empty?
     elsif ! id.nil?
       @server = id
-    end    
+    end
     init_server
   end
-  
+
   def server
     compute
     load unless @server
     @server
   end
-   
+
   #---
-  
+
   def state
     return translate_state(server.state) if server
     translate_state(:aborted)
   end
-   
+
   #---
-  
+
   def public_ip
     return server.public_ip_address if server
     nil
   end
-  
+
   #---
-  
+
   def private_ip
     return server.private_ip_address if server
     nil
   end
-  
+
   #---
-    
+
   def machine_types
     return compute.flavors if compute
     []
   end
-  
+
   #---
-  
+
   def machine_type
     return server.flavor.id if server
     nil
   end
-  
+
   #---
-  
+
   def images
     return compute.images if compute
     []
   end
-  
+
   #---
-  
+
   def image
     return server.image.id if server
     nil
   end
-  
+
   #-----------------------------------------------------------------------------
   # Management
-  
+
   def init_server
     unless @server.nil?
       yield # Implement in fog machine providers
-    end  
+    end
   end
   protected :init_server
-  
+
   #---
-  
+
   def load
     super do
       myself.server = plugin_name if compute && plugin_name
       ! plugin_name && @server.nil? ? false : true
-    end    
+    end
   end
-  
+
   #---
-  
+
   def create(options = {}, &code)
     super do |config|
       if compute
@@ -154,83 +155,83 @@ class Fog < Nucleon.plugin_class(:CORL, :machine)
       myself.server ? true : false
     end
   end
-  
+
   #---
-  
+
   def download(remote_path, local_path, options = {}, &code)
     super do |config, success|
       ssh_download(remote_path, local_path, config, &code)
-    end  
+    end
   end
-  
+
   #---
-  
+
   def upload(local_path, remote_path, options = {}, &code)
     super do |config, success|
       ssh_upload(local_path, remote_path, config, &code)
-    end  
+    end
   end
-  
+
   #---
-  
+
   def exec(commands, options = {}, &code)
     super do |config|
       ssh_exec(commands, config, &code)
     end
   end
-  
+
   #---
-  
+
   def terminal(user, options = {})
     super do |config|
       ssh_terminal(user, config)
     end
   end
-  
+
   #---
-  
+
   def reload(options = {}, &code)
     super do |config|
-      success = code ? code.call(config) : true            
+      success = code ? code.call(config) : true
       success = init_ssh_session(true, config.get(:tries, 12), config.get(:sleep_time, 5)) if success
     end
   end
 
   #---
- 
+
   def create_image(options = {}, &code)
     super do |config|
       image_name = sprintf("%s (%s)", node.plugin_name, Time.now.to_s)
-      
-      success = code ? code.call(image_name, config, success) : true 
+
+      success = code ? code.call(image_name, config, success) : true
       success = init_ssh_session(true, config.get(:tries, 12), config.get(:sleep_time, 5)) if success
     end
   end
-  
+
   #---
-  
+
   def stop(options = {})
     super do |config|
-      success = false            
+      success = false
       success = destroy(config.import({ :stop => true })) if create_image(config)
     end
   end
-  
+
   #---
 
   def destroy(options = {}, &code)
     super do |config|
       success = server.destroy
       success = code.call(config) if success && code
-      
+
       close_ssh_session if success
       success
     end
   end
-  
+
   #-----------------------------------------------------------------------------
   # Utilities
-  
+
   def ssh_wait_for_ready
     server.wait_for { ready? }
   end