knife-softlayer 0.3.11 → 0.3.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjY0ZTQ0ZTI5NzNkNWVkNGE5YWE1YmFhMWM4ZDY2YmE0NzNjZDAxZA==
+    ZjczMGVhNjA5ODNhY2I3NTE4Mjc5YzlmMTg3ZjhlYzVlOGMwZDRmMQ==
   data.tar.gz: !binary |-
-    MDRkMDZlODBkM2UwMDYyMmI4YmZhNzEzZWU2ZDliOTU2NzMyNmEwMA==
+    ZGNiMDg4NGUzZTcwZDVkM2ZhYzg0N2M4MDcxYWI0Y2Q1ZmI1OGEyYQ==
 SHA512:
   metadata.gz: !binary |-
-    MzNkNjE5NWFlMTY0OGE5NGFiYmQ4MTI0ODk4OTUwYzExYzYyYzc1MGI3YThh
-    OTFlMzBjODAzNDgyOTgxY2ZlYmU2MGRmZmI0NmQyNTRiOTIxMmNiNWJlZTQ1
-    OTNiZTAxMTUwZmQ5MzliNWYyZjAxNTVmNjVmMDc4YmNhZWUxY2E=
+    ODRlNTJiNTZkNzliMTkwNDk2OTA2ODNiNDMzMWU0ZjM0MDA5ZjI0N2M3MzM0
+    ZDk4YzFmNjM5ODFlNzk5MjgxYjg4ZGYyNmNiYjhjYzAwNmY5NDkxMjRhNzY3
+    NzNmOGU2ZDc5YTQ0N2U2NGFhOTE0NjUyOGJlOWI5MmU4ZWIzYWQ=
   data.tar.gz: !binary |-
-    ODczMjIyMGU0MTNkNzBjYTI4Nzg5YTBhN2M0MDg4ZWY1YzM4ZTUyMWE1YWVi
-    N2E4MzVjYWFlNTlmNzU3OGViNGRiZjVhMWRlNWQ1YTdmMzdmOWNjYzIxMTI2
-    OWI3ZmZkMTBjNDhhMTJjNmFmZWRiODQ1MWM4NzQyM2ZlNzM4YWQ=
+    NWUwZDU3ZTE5YmFlMDA0NTc5ZDkyNzY1YmM3ZGRhMjA2YWJhNDZmMTgyOTEz
+    YTkyNjQ1OGQxNThhYmFlYmQ0MmVkMGYxZTNiNjM3ZmM4NWFlMmVjY2I5NzJl
+    N2M5YzM4MDI2MTNmOTQ4OTA3YTg1NjNjYTg2ZDgyNGQzZjQ3ODI=

data/lib/chef/knife/softlayer_server_create.rb

@@ -239,6 +239,10 @@ class Chef
                Chef::Config[:knife][:hints][name] = path ? JSON.parse(::File.read(path)) : Hash.new
              }
 
+      require 'chef/knife/bootstrap'
+      # Make the base bootstrap options available on topo bootstrap
+      self.options = (Chef::Knife::Bootstrap.options).merge(self.options)
+
       ##
       # Run the procedure to create a SoftLayer VM and bootstrap it.
       # @return [nil]

data/lib/chef/knife/softlayer_server_destroy.rb

@@ -50,6 +50,17 @@ class Chef
           @chef.search('node', "ipaddress:#{config[:ip_address]}") do |node|
             @node = node
           end
+        elsif arg = name_args[0]
+          if arg =~ /^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/ # ipv4
+            query = "ipaddress:#{arg}"
+          elsif arg =~ /^(?:[A-F0-9]{1,4}:){7}[A-F0-9]{1,4}$/ # ipv6
+            query = "ipaddress:#{arg}"
+          else
+            query = "name:#{arg}"
+          end
+          @chef.search('node', query) do |node|
+            @node = node
+          end
         else
           raise "#{ui.color("FATAL: Please supply the node name or IP address.", :red)}"
         end

data/lib/chef/knife/softlayer_server_relaunch.rb

@@ -0,0 +1,106 @@
+#
+# Author:: Matt Eldridge (<matt.eldridge@us.ibm.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: Apache 2.0 (http://www.apache.org/licenses/)
+#
+
+require 'chef/knife/softlayer_base'
+
+class Chef
+  class Knife
+    class SoftlayerServerRelaunch < Knife
+
+      include Knife::SoftlayerBase
+
+      banner 'knife softlayer server relaunch <NODE NAME> [<NODE NAME>]'
+
+      option :all,
+             :short => "-a",
+             :long => "--all",
+             :description => "Display all available configuration options for launching an instance.",
+             :default => false
+
+      require 'chef/knife/bootstrap'
+      # Make the base bootstrap options available on topo bootstrap
+      self.options = (Chef::Knife::Bootstrap.options).merge(self.options)
+
+      ##
+      # Run the procedure to list softlayer VM flavors or display all available options.
+      # @return [nil]
+      def run
+        $stdout.sync = true
+        if name_args.count < 1
+          ui.fatal("Server relaunch requires AT LEAST ONE node name.")
+          exit 1;
+        end
+
+        ident_file = Chef::Config[:knife][:identity_file] || config[:identity_file]
+        Fog.credentials[:private_key_path] = ident_file if ident_file
+
+        Chef::Search::Query.new.search(:node, "name:#{name_args[0]}") do |object|
+          @vm = connection.servers.select { |s| s.public_ip == object.ipaddress }.first
+        end
+        ui.fatal("Server not found on SoftLayer account.") and exit 1 unless @vm
+
+        unless @vm.sshable?
+          ui.fatal("Node with name #{name_args[0]} not sshable, relaunch canceled.")
+          exit 1
+        end
+
+        # grab the contents of /etc/chef from the target node and stash a local copy
+        begin
+          puts ui.color("Capturing existing node configuration files.", :green)
+          @vm.scp_download("/etc/chef", "/tmp/#{@vm.id}/", :recursive => true)
+        rescue Exception => e
+          puts ui.color(e.message, :red)
+          ui.fatal('Relaunch canceled.')
+          exit 1
+        end
+
+        begin
+          puts ui.color("Relaunching SoftLayer server, this may take a few minutes.", :green)
+          @vm.relaunch!
+          @vm.wait_for { putc '.'; ready? && sshable? }
+          puts ''
+        rescue Exception => e
+          puts ui.color(e.message, :red)
+          ui.fatal('Relaunch FAILED. You may be missing a server.')
+          exit 1
+        end
+
+        # push the locally stashed config items up to new machine
+        begin
+          puts ui.color("Installing node configuration on relaunched server.", :green)
+          @vm.scp("/tmp/#{@vm.id}/chef/", "/etc/", :recursive => true)
+        rescue Exception => e
+          puts ui.color(e.message, :red)
+          ui.fatal('Relaunch FAILED. You may be missing a chef node.')
+          exit 1
+        end
+
+        begin
+          puts ui.color("Installing chef-client executable on relaunched server.", :green)
+          puts @vm.ssh('wget https://www.chef.io/chef/install.sh && sudo bash ./install.sh && rm install.sh').first.stdout
+        rescue Exception => e
+          puts ui.color(e.message, :red)
+          ui.fatal('Relaunch FAILED. You may be missing a chef node.')
+          exit 1
+        end
+
+        # run chef-client on the new machine with the existing config and attributes
+        begin
+          puts ui.color("Initial run of chef-client on relaunched server, this may take a few minutes.", :green)
+          puts @vm.ssh('sudo chef-client -j /etc/chef/first-boot.json').first.stdout
+        rescue Exception => e
+          puts ui.color(e.message, :red)
+          ui.fatal('Relaunch FAILED on chef run. Your chef node may be misconfigured.')
+          exit 1
+        end
+
+      end
+
+    end
+  end
+end
+

data/lib/knife-softlayer/version.rb

@@ -7,6 +7,6 @@
 
 module Knife
   module Softlayer
-    VERSION = "0.3.11"
+    VERSION = "0.3.12"
   end
 end

data/spec/unit/softlayer_server_create_spec.rb

@@ -34,11 +34,12 @@ describe Chef::Knife::SoftlayerServerCreate do
       expect { @server_create.run }.to raise_exception(Chef::Knife::SoftlayerServerCreateError)
     end
 
+
     [':ram', ':cores', ':hostname', ':domain', ':datacenter', ':os_code', ':block_storage'].each do |opt|
     class_eval <<EOS, __FILE__, __LINE__
-    it "should should raise an ArgumentError if missing #{opt} option" do
+    it "should should raise an exception if missing #{opt} option" do
       @server_create.config.delete(#{opt})
-      expect { @server_create.run }.to raise_exception(ArgumentError)
+      expect { @server_create.run }.to raise_exception
     end
 EOS
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-softlayer
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - Matt Eldridge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-softlayer
@@ -191,6 +191,7 @@ files:
 - lib/chef/knife/softlayer_list.rb
 - lib/chef/knife/softlayer_server_create.rb
 - lib/chef/knife/softlayer_server_destroy.rb
+- lib/chef/knife/softlayer_server_relaunch.rb
 - lib/chef/knife/softlayer_vlan_create.rb
 - lib/chef/knife/softlayer_vlan_list.rb
 - lib/chef/knife/softlayer_vlan_show.rb