corl 0.4.15 → 0.4.16

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b4edb990285aa696910d5e592213b5a91b5e5f6e
+  data.tar.gz: de66aaa2bdf8677c6a0eafead3233557326b0595
+SHA512:
+  metadata.gz: 953891d538e823b0dd7c29b2b07ca2311a3abce4aab3cb69771e61b17c6bef119d02c87732cc1a84bdc059692c45141b7c78751d88bd4efdd0344faa5c4a2fb6
+  data.tar.gz: c92c87e4c910691a82d140ac025d381db9b7cb691f62f024ca4598b8bece484dcfafbcbfd85cb9e63ae2b1c3aee362275ac03aa3cf77404e98d463525c658d76

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "nucleon", "~> 0.1"
+gem "nucleon", "~> 0.1", ">= 0.1.10", :github => 'coralnexus/nucleon', :branch => '0.1'
 
 gem "fog", "~> 1.20"
 gem "unf", "~> 0.1"
@@ -16,4 +16,9 @@ group :development do
   gem "rspec", "~> 2.10"
   gem "rdoc", "~> 3.12"
   gem "yard", "~> 0.8"
+  gem "vagrant", "~> 1.5", :github => 'mitchellh/vagrant', :branch => 'master'
+end
+
+group :plugins do
+  gem "corl", :path => "."
 end

data/Gemfile.lock

@@ -1,15 +1,62 @@
+GIT
+  remote: git://github.com/coralnexus/nucleon.git
+  revision: 924063f5b5fd6680e438d7b3ea91bc655e7e6837
+  branch: 0.1
+  specs:
+    nucleon (0.1.13)
+      celluloid (~> 0.15)
+      childprocess (~> 0.5)
+      deep_merge (~> 1.0)
+      i18n (~> 0.6)
+      log4r (~> 1.1)
+      multi_json (~> 1.7)
+      netrc (~> 0.7)
+      octokit (~> 2.7)
+      rugged (~> 0.19)
+      sshkey (~> 1.6)
+
+GIT
+  remote: git://github.com/mitchellh/vagrant.git
+  revision: e8f1f301e6bab643ae652d2ed1fcee0c6ee820c4
+  branch: master
+  specs:
+    vagrant (1.5.3.dev)
+      bundler (~> 1.5.2)
+      childprocess (~> 0.5.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6.0)
+      listen (~> 2.4.0)
+      log4r (~> 1.1.9, < 1.1.11)
+      net-scp (~> 1.1.0)
+      net-ssh (>= 2.6.6, < 2.8.0)
+      rb-kqueue (~> 0.2.0)
+      wdm (~> 0.1.0)
+
+PATH
+  remote: .
+  specs:
+    corl (0.4.16)
+      facter (~> 1.7)
+      fog (~> 1.20)
+      hiera (~> 1.3)
+      nucleon (~> 0.1, >= 0.1.10)
+      puppet (~> 3.2)
+      unf (~> 0.1)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.5)
+    addressable (2.3.6)
     builder (3.2.2)
     celluloid (0.15.2)
       timers (~> 1.1.0)
-    childprocess (0.5.1)
+    childprocess (0.5.2)
       ffi (~> 1.0, >= 1.0.11)
     deep_merge (1.0.1)
-    descendants_tracker (0.0.3)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
+    erubis (2.7.0)
     excon (0.32.1)
     facter (1.7.5)
     faraday (0.9.0)
@@ -42,11 +89,7 @@ GEM
       multi_json (>= 1.7.5, < 2.0)
       nokogiri (~> 1.6.0)
       oauth2
-    grit (2.5.0)
-      diff-lcs (~> 1.1)
-      mime-types (~> 1.15)
-      posix-spawn (~> 0.3.6)
-    hashie (2.0.5)
+    hashie (2.1.0)
     hiera (1.3.2)
       json_pure
     highline (1.6.21)
@@ -64,29 +107,22 @@ GEM
     json_pure (1.8.1)
     jwt (0.1.11)
       multi_json (>= 1.5)
+    listen (2.4.1)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
     log4r (1.1.10)
-    mime-types (1.25.1)
-    mini_portile (0.5.2)
+    mime-types (2.2)
+    mini_portile (0.5.3)
     multi_json (1.9.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.8.0)
+    net-ssh (2.7.0)
     netrc (0.7.7)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
-    nucleon (0.1.8)
-      celluloid (~> 0.15)
-      childprocess (~> 0.5.0)
-      deep_merge (~> 1.0)
-      grit (~> 2.5)
-      i18n (~> 0.6)
-      log4r (~> 1.1)
-      multi_json (~> 1.7)
-      netrc (~> 0.7)
-      octokit (~> 2.7)
-      sshkey (~> 1.6)
     oauth2 (0.9.3)
       faraday (>= 0.8, < 0.10)
       jwt (~> 0.1.8)
@@ -95,13 +131,18 @@ GEM
       rack (~> 1.2)
     octokit (2.7.2)
       sawyer (~> 0.5.2)
-    posix-spawn (0.3.8)
-    puppet (3.4.3)
-      facter (~> 1.6)
+    puppet (3.5.0)
+      facter (> 1.6, < 3)
       hiera (~> 1.0)
+      json_pure
       rgen (~> 0.6.5)
     rack (1.5.2)
-    rake (10.1.1)
+    rake (10.2.2)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.3)
+      ffi (>= 0.5.0)
+    rb-kqueue (0.2.2)
+      ffi (>= 0.5.0)
     rdoc (3.12.2)
       json (~> 1.4)
     rgen (0.6.6)
@@ -113,28 +154,33 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
-    sawyer (0.5.3)
+    rugged (0.19.0)
+    sawyer (0.5.4)
       addressable (~> 2.3.5)
       faraday (~> 0.8, < 0.10)
     sshkey (1.6.1)
+    thread_safe (0.3.3)
     timers (1.1.0)
-    unf (0.1.3)
+    unf (0.1.4)
       unf_ext
     unf_ext (0.0.6)
-    yard (0.8.7.3)
+    wdm (0.1.0)
+    yard (0.8.7.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.2)
+  corl!
   facter (~> 1.7)
   fog (~> 1.20)
   hiera (~> 1.3)
   jeweler (~> 2.0)
-  nucleon (~> 0.1)
+  nucleon (~> 0.1, >= 0.1.10)!
   puppet (~> 3.2)
   rdoc (~> 3.12)
   rspec (~> 2.10)
   unf (~> 0.1)
+  vagrant (~> 1.5)!
   yard (~> 0.8)

data/Rakefile

@@ -34,7 +34,7 @@ Jeweler::Tasks.new do |gem|
   gem.authors               = ["Adrian Webb"]
   gem.summary               = %Q{Cluster Orchestration and Research Library}
   gem.description           = %Q{Framework that provides a simple foundation for growing organically in the cloud} 
-  gem.required_ruby_version = '>= 1.8.1'
+  gem.required_ruby_version = '>= 2.0'
   gem.has_rdoc              = true
   gem.rdoc_options << '--title' << 'Cluster Orchestration and Research Library' <<
                       '--main' << 'README.rdoc' <<

data/VERSION

@@ -1 +1 @@
-0.4.15
+0.4.16

data/bootstrap/bootstrap.sh

@@ -16,6 +16,9 @@ Systems initialized:
 
 * Git    - Git packages installed
 
+* Vim    - Vim and vim script packages installed
+         - Vim configured
+
 * Ruby   - Ruby 1.9.x packages installed
          - Execution alternative configuration (if applicable)
 
@@ -29,8 +32,8 @@ Systems initialized:
 Tested under Ubuntu 12.04 LTS
 Licensed under GPLv3
 
-See the project page at: http://github.com/coralnexus/coral-bootstrap
-Report issues here:      http://github.com/coralnexus/coral-bootstrap/issues
+See the project page at: http://github.com/coralnexus/corl-bootstrap
+Report issues here:      http://github.com/coralnexus/corl-bootstrap/issues
 "
 fi
 

data/bootstrap/os/ubuntu/00_base.sh

@@ -14,4 +14,4 @@ echo "nameserver 208.67.222.222" | tee /etc/resolvconf/resolv.conf.d/base > /dev
 apt-get update || exit 4
 
 # Install basic build packages.
-apt-get -y install build-essential curl || exit 5
+apt-get -y install build-essential python-software-properties curl || exit 5

data/bootstrap/os/ubuntu/01_git.sh

@@ -3,3 +3,12 @@
 
 # Install Git.
 apt-get -y install git || exit 10
+
+echo "Hello $USER"
+
+# Make sure it is easy to communicate with repo hosts
+mkdir -p ~/.ssh || exit 11
+touch ~/.ssh/known_hosts || exit 12
+
+ssh-keygen -R github.com 2>&1 || exit 13 # No duplicates
+ssh-keyscan -H github.com >> ~/.ssh/known_hosts || exit 14

data/bootstrap/os/ubuntu/05_ruby.sh

@@ -2,12 +2,15 @@
 #-------------------------------------------------------------------------------
 
 # Install Ruby.
-apt-get -y install ruby1.9.1 ruby1.9.1-dev || exit 50
-update-alternatives --set ruby /usr/bin/ruby1.9.1 || exit 51
-update-alternatives --set gem /usr/bin/gem1.9.1 || exit 52
+add-apt-repository ppa:brightbox/ruby-ng-experimental 2>&1 || exit 51
+apt-get update || exit 52
+
+apt-get -y install ruby2.1 ruby2.1-dev || exit 53
+update-alternatives --set ruby /usr/bin/ruby2.1 || exit 54
+update-alternatives --set gem /usr/bin/gem2.1 || exit 55
 
 # Set Gem options
 ( cat <<'EOP'
 gem: --no-rdoc --no-ri 
 EOP
-) > "$HOME/.gemrc" || exit 53
+) > "$HOME/.gemrc" || exit 56

data/bootstrap/os/ubuntu/06_puppet.sh

@@ -2,7 +2,7 @@
 #-------------------------------------------------------------------------------
 
 # Set up Puppet Apt repositories
-apt-key adv --recv-key --keyserver pgp.mit.edu 4BD6EC30 || exit 60
+apt-key adv --recv-key --keyserver pgp.mit.edu 4BD6EC30 2>&1 || exit 60
 
 ( cat <<'EOP'
 deb http://apt.puppetlabs.com precise main dependencies
@@ -34,4 +34,4 @@ EOP
 ) > /etc/hiera.yaml || exit 66
 chmod 0440 /etc/hiera.yaml || exit 67
 
-ln -fs /etc/hiera.yaml /etc/puppet/hiera.yaml || exit 68
+ln -fs /etc/hiera.yaml /etc/puppet/hiera.yaml || exit 68

data/corl.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: corl 0.4.16 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "corl"
-  s.version = "0.4.15"
+  s.version = "0.4.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Adrian Webb"]
-  s.date = "2014-03-24"
+  s.date = "2014-04-08"
   s.description = "Framework that provides a simple foundation for growing organically in the cloud"
   s.email = "adrian.webb@coralnexus.com"
   s.executables = ["corl"]
@@ -51,6 +53,7 @@ Gem::Specification.new do |s|
     "lib/CORL/action/exec.rb",
     "lib/CORL/action/image.rb",
     "lib/CORL/action/images.rb",
+    "lib/CORL/action/ip.rb",
     "lib/CORL/action/keypair.rb",
     "lib/CORL/action/lookup.rb",
     "lib/CORL/action/machines.rb",
@@ -61,15 +64,18 @@ Gem::Specification.new do |s|
     "lib/CORL/action/ssh.rb",
     "lib/CORL/action/start.rb",
     "lib/CORL/action/stop.rb",
+    "lib/CORL/action/vagrantfile.rb",
     "lib/CORL/configuration/file.rb",
     "lib/CORL/event/puppet.rb",
     "lib/CORL/machine/aws.rb",
     "lib/CORL/machine/physical.rb",
     "lib/CORL/machine/rackspace.rb",
+    "lib/CORL/machine/vagrant.rb",
     "lib/CORL/network/default.rb",
     "lib/CORL/node/aws.rb",
     "lib/CORL/node/local.rb",
     "lib/CORL/node/rackspace.rb",
+    "lib/CORL/node/vagrant.rb",
     "lib/CORL/provisioner/puppetnode.rb",
     "lib/CORL/template/environment.rb",
     "lib/core/errors.rb",
@@ -91,6 +97,12 @@ Gem::Specification.new do |s|
     "lib/core/util/puppet.rb",
     "lib/core/util/puppet/resource.rb",
     "lib/core/util/puppet/resource_group.rb",
+    "lib/core/vagrant/Vagrantfile",
+    "lib/core/vagrant/commands/launcher.rb",
+    "lib/core/vagrant/config.rb",
+    "lib/core/vagrant/plugins.rb",
+    "lib/core/vagrant/provisioner/config.rb",
+    "lib/core/vagrant/provisioner/provisioner.rb",
     "lib/corl.rb",
     "lib/facter/corl_build.rb",
     "lib/facter/corl_config_ready.rb",
@@ -129,17 +141,16 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/coralnexus/corl"
   s.licenses = ["GPLv3"]
   s.rdoc_options = ["--title", "Cluster Orchestration and Research Library", "--main", "README.rdoc", "--line-numbers"]
-  s.require_paths = ["lib"]
-  s.required_ruby_version = Gem::Requirement.new(">= 1.8.1")
+  s.required_ruby_version = Gem::Requirement.new(">= 2.0")
   s.rubyforge_project = "corl"
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "2.2.2"
   s.summary = "Cluster Orchestration and Research Library"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<nucleon>, ["~> 0.1"])
+      s.add_runtime_dependency(%q<nucleon>, [">= 0.1.10", "~> 0.1"])
       s.add_runtime_dependency(%q<fog>, ["~> 1.20"])
       s.add_runtime_dependency(%q<unf>, ["~> 0.1"])
       s.add_runtime_dependency(%q<facter>, ["~> 1.7"])
@@ -150,8 +161,9 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, ["~> 2.10"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<yard>, ["~> 0.8"])
+      s.add_development_dependency(%q<vagrant>, ["~> 1.5"])
     else
-      s.add_dependency(%q<nucleon>, ["~> 0.1"])
+      s.add_dependency(%q<nucleon>, [">= 0.1.10", "~> 0.1"])
       s.add_dependency(%q<fog>, ["~> 1.20"])
       s.add_dependency(%q<unf>, ["~> 0.1"])
       s.add_dependency(%q<facter>, ["~> 1.7"])
@@ -162,9 +174,10 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, ["~> 2.10"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<yard>, ["~> 0.8"])
+      s.add_dependency(%q<vagrant>, ["~> 1.5"])
     end
   else
-    s.add_dependency(%q<nucleon>, ["~> 0.1"])
+    s.add_dependency(%q<nucleon>, [">= 0.1.10", "~> 0.1"])
     s.add_dependency(%q<fog>, ["~> 1.20"])
     s.add_dependency(%q<unf>, ["~> 0.1"])
     s.add_dependency(%q<facter>, ["~> 1.7"])
@@ -175,6 +188,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, ["~> 2.10"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<yard>, ["~> 0.8"])
+    s.add_dependency(%q<vagrant>, ["~> 1.5"])
   end
 end
 

data/lib/CORL/action/authorize.rb

@@ -8,8 +8,7 @@ class Authorize < Plugin::CloudAction
   
   def configure
     super do
-      codes :network_failure,
-            :key_store_failure
+      codes :key_store_failure
       
       register :public_key, :str, nil
     end
@@ -28,7 +27,7 @@ class Authorize < Plugin::CloudAction
     super do |node, network|
       info('corl.actions.authorize.start')
       
-      if network && node
+      ensure_node(node) do
         ssh_path        = Util::SSH.key_path
         authorized_keys = File.join(ssh_path, 'authorized_keys')        
         public_key      = settings[:public_key].strip
@@ -47,8 +46,6 @@ class Authorize < Plugin::CloudAction
             myself.status = code.key_store_failure
           end
         end
-      else
-        myself.status = code.network_failure
       end
     end
   end

data/lib/CORL/action/bootstrap.rb

@@ -8,8 +8,6 @@ class Bootstrap < Plugin::CloudAction
   
   def configure
     super do
-      codes :network_failure
-      
       register :auth_files, :array, [] do |values|
         success = true
         values.each do |value|
@@ -69,7 +67,7 @@ class Bootstrap < Plugin::CloudAction
     
   def execute
     super do |local_node, network|
-      if network
+      ensure_network(network) do
         batch_success = network.batch(settings[:bootstrap_nodes], settings[:node_provider], settings[:parallel]) do |node|
           render_options = { :id => node.id, :hostname => node.hostname }
           
@@ -84,8 +82,6 @@ class Bootstrap < Plugin::CloudAction
           success
         end
         myself.status = code.batch_error unless batch_success
-      else
-        myself.status = code.network_failure
       end
     end
   end

data/lib/CORL/action/build.rb

@@ -6,22 +6,14 @@ class Build < Plugin::CloudAction
   #-----------------------------------------------------------------------------
   # Settings
   
-  def configure
-    super do
-      codes :network_failure
-    end
-  end
-  
   #-----------------------------------------------------------------------------
   # Operations
    
   def execute
     super do |node, network|
-      if network && node
-        info('corl.actions.build.start')  
+      info('corl.actions.build.start') 
+      ensure_node(node) do         
         node.build
-      else
-        myself.status = code.network_failure
       end
     end
   end

data/lib/CORL/action/destroy.rb

@@ -8,8 +8,6 @@ class Destroy < Plugin::CloudAction
   
   def configure
     super do
-      codes :network_failure
-            
       register :destroy_nodes, :array, nil do |values|
         if values.nil?
           warn('corl.actions.destroy.errors.destroy_nodes_empty')
@@ -47,15 +45,12 @@ class Destroy < Plugin::CloudAction
    
   def execute
     super do |local_node, network|
-      info('corl.actions.destroy.start')
-      
-      if network
+      ensure_network(network) do
         batch_success = network.batch(settings[:destroy_nodes], settings[:node_provider], settings[:parallel]) do |node|
+          info('corl.actions.stop.start', { :provider => node.plugin_provider, :name => node.plugin_name })
           node.destroy
         end
         myself.status = code.batch_error unless batch_success
-      else
-        myself.status = code.network_failure  
       end
     end
   end

data/lib/CORL/action/exec.rb

@@ -8,8 +8,6 @@ class Exec < Plugin::CloudAction
   
   def configure
     super do
-      codes :network_failure
-            
       register :command, :array, nil
     end
   end
@@ -25,7 +23,7 @@ class Exec < Plugin::CloudAction
    
   def execute
     super do |node, network|
-      if network && node
+      ensure_node(node) do
         if settings[:command].length > 1
           settings[:command].collect! do |value|
             if value.strip.match(/\s+/)
@@ -38,8 +36,6 @@ class Exec < Plugin::CloudAction
         command_str   = settings[:command].join(' ')
         result        = node.exec({ :commands => [ command_str ] }).first
         myself.status = result.status
-      else
-        myself.status = code.network_failure
       end
     end
   end

data/lib/CORL/action/image.rb

@@ -8,8 +8,6 @@ class Image < Plugin::CloudAction
   
   def configure
     super do
-      codes :network_failure
-      
       register :image_nodes, :array, nil do |values|
         if values.nil?
           warn('corl.actions.image.errors.image_nodes_empty')
@@ -47,14 +45,12 @@ class Image < Plugin::CloudAction
    
   def execute
     super do |local_node, network|
-      if network
+      ensure_network(network) do
         batch_success = network.batch(settings[:image_nodes], settings[:node_provider], settings[:parallel]) do |node|
           info('corl.actions.image.start', { :provider => node.plugin_provider, :name => node.plugin_name })
           node.create_image
         end
         myself.status = code.batch_error unless batch_success  
-      else
-        myself.status = code.network_failure
       end    
     end
   end

data/lib/CORL/action/images.rb

@@ -35,19 +35,21 @@ class Images < Plugin::CloudAction
     super do |local_node, network|
       info('corl.actions.images.start')
       
-      if node = network.test_node(settings[:node_provider], { :region => settings[:region] })
-        if images = node.images(settings[:search], settings)
-          images.each do |image|
-            render(node.render_image(image), { :prefix => false })
-          end
+      ensure_network(network) do
+        if node = network.test_node(settings[:node_provider], { :region => settings[:region] })
+          if images = node.images(settings[:search], settings)
+            images.each do |image|
+              render(node.render_image(image), { :prefix => false })
+            end
           
-          myself.result = images
-          success('corl.actions.images.results', { :images => images.length }) if images.length > 1
+            myself.result = images
+            success('corl.actions.images.results', { :images => images.length }) if images.length > 1
+          else
+            myself.status = code.image_load_failure
+          end
         else
-          myself.status = code.image_load_failure
+          myself.status = code.node_load_failure
         end
-      else
-        myself.status = code.node_load_failure
       end
     end
   end

data/lib/CORL/action/ip.rb

@@ -0,0 +1,21 @@
+
+module CORL
+module Action
+class Ip < Plugin::CloudAction
+ 
+  #-----------------------------------------------------------------------------
+  # Settings
+  
+  #-----------------------------------------------------------------------------
+  # Operations
+   
+  def execute
+    super do |node, network|
+      ensure_node(node) do
+        ui.info(CORL.public_ip)
+      end
+    end
+  end
+end
+end
+end

data/lib/CORL/action/lookup.rb

@@ -23,10 +23,12 @@ class Lookup < Plugin::CloudAction
    
   def execute
     super do |node, network|
-      property = settings[:property]
-      value    = node.lookup(property)
+      ensure_node(node) do
+        property = settings[:property]
+        value    = node.lookup(property)
       
-      node.render(sprintf("#{property} = %s", value.inspect))
+        ui.info(sprintf("#{property} = %s", value.inspect))
+      end
     end
   end
 end

data/lib/CORL/action/machines.rb

@@ -30,19 +30,21 @@ class Machines < Plugin::CloudAction
     super do |local_node, network|
       info('corl.actions.machines.start')
       
-      if node = network.test_node(settings[:node_provider])
-        if machine_types = node.machine_types
-          machine_types.each do |machine_type|
-            render(node.render_machine_type(machine_type), { :prefix => false })
-          end
+      ensure_network(network) do
+        if node = network.test_node(settings[:node_provider])
+          if machine_types = node.machine_types
+            machine_types.each do |machine_type|
+              render(node.render_machine_type(machine_type), { :prefix => false })
+            end
           
-          myself.result = machine_types
-          success('corl.actions.machines.results', { :machines => machine_types.length }) if machine_types.length > 1
+            myself.result = machine_types
+            success('corl.actions.machines.results', { :machines => machine_types.length }) if machine_types.length > 1
+          else
+            myself.status = code.machine_load_failure
+          end
         else
-          myself.status = code.machine_load_failure
+          myself.status = code.node_load_failure
         end
-      else
-        myself.status = code.node_load_failure
       end
     end
   end