knife-softlayer 0.3.12 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjczMGVhNjA5ODNhY2I3NTE4Mjc5YzlmMTg3ZjhlYzVlOGMwZDRmMQ==
+    NDViMjM2MDdmMzEyNzc3Yzc2YTk2ZGZlMDBiNTAyM2M3ZGMwNmExYQ==
   data.tar.gz: !binary |-
-    ZGNiMDg4NGUzZTcwZDVkM2ZhYzg0N2M4MDcxYWI0Y2Q1ZmI1OGEyYQ==
+    Mjg0MjRiNmVmMDJiYTM4M2NjZGRmMTNlYjQxZjdjMGZmNjAwYWEzYg==
 SHA512:
   metadata.gz: !binary |-
-    ODRlNTJiNTZkNzliMTkwNDk2OTA2ODNiNDMzMWU0ZjM0MDA5ZjI0N2M3MzM0
-    ZDk4YzFmNjM5ODFlNzk5MjgxYjg4ZGYyNmNiYjhjYzAwNmY5NDkxMjRhNzY3
-    NzNmOGU2ZDc5YTQ0N2U2NGFhOTE0NjUyOGJlOWI5MmU4ZWIzYWQ=
+    ZDc1MzRmMDI2MTk2MTE2NDg3MWY2M2RiZGI3MDlkYjVmNTAzMzJiM2U2NzMw
+    OTRlMzkyNzYyODliMjllZWFjZjExYzU4ZDI5NDg3MzIxZjBlODg2NDhlMzdi
+    Yjc4YjMzNDNkN2RlOWViMzhjNjk1ZWNhNDQ3YmNlZjhmMDExYjg=
   data.tar.gz: !binary |-
-    NWUwZDU3ZTE5YmFlMDA0NTc5ZDkyNzY1YmM3ZGRhMjA2YWJhNDZmMTgyOTEz
-    YTkyNjQ1OGQxNThhYmFlYmQ0MmVkMGYxZTNiNjM3ZmM4NWFlMmVjY2I5NzJl
-    N2M5YzM4MDI2MTNmOTQ4OTA3YTg1NjNjYTg2ZDgyNGQzZjQ3ODI=
+    MjVjYzI5ZDRmMjM4MjZiZjU5ZjgxMjRlMWNmZThjZGU0ODc0MGExNjEyMTQy
+    ZTBkNDNiNWRkNzBiMDRjN2EwZmIxOTYwMmJiZjMyMDNmMWFjODA0MjkzZGRm
+    YzFmMzEyMjgwYzg4MjlmNGU2MzVhMThkNDgyOGFjZDI3YmFlZGY=

data/knife-softlayer.gemspec

@@ -25,8 +25,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(spec|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "fog-softlayer", "0.3.29"
-  #spec.add_dependency "fog-softlayer", "~> 0.3", ">= 0.3.29"
+  spec.add_dependency "fog-softlayer", "~> 0.3.30"
   spec.add_dependency "knife-windows", "> 0.5.12"
   spec.add_dependency "net-ssh", "> 2.8.0"
 

data/lib/chef/knife/softlayer_base.rb

@@ -5,7 +5,7 @@
 # LICENSE: Apache 2.0 (http://www.apache.org/licenses/)
 #
 
-require 'chef/knife'
+require 'chef/knife/bootstrap'
 require 'knife-softlayer/version'
 
 class Chef
@@ -32,6 +32,9 @@ class Chef
             require 'chef/json_compat'
           end
 
+          # Make the base bootstrap options available on topo bootstrap
+          self.options = (Chef::Knife::Bootstrap.options).merge(self.options)
+
           option :softlayer_credential_file,
                  :long => "--softlayer-credential-file FILE",
                  :description => "File containing SoftLayer credentials as used by `softlayer_api` Ruby gem.",

data/lib/chef/knife/softlayer_server_create.rb

@@ -85,6 +85,11 @@ class Chef
         :description => 'Flag to be passed when the compute instance should have no public facing network interface.',
         :boolean => true
 
+      option :use_private_network,
+        :long => '--use-private-network',
+        :description => 'Flag to be passwed when bootstrap is preferred over the private network.',
+        :boolean => true
+
       option :from_file,
              :long => '--from-file PATH',
              :description => 'Path to JSON file containing arguments for provisoning and bootstrap.'
@@ -297,7 +302,7 @@ class Chef
 
         puts ui.color("Launching SoftLayer VM, this may take a few minutes.", :green)
         instance = connection.servers.create(opts)
-        if config[:private_network_only]
+        if config[:private_network_only] || config[:use_private_network]
           instance.ssh_ip_address = Proc.new {|server| server.private_ip_address }
         end
         progress Proc.new { instance.wait_for { ready? and sshable? } }

data/lib/chef/knife/softlayer_server_destroy.rb

@@ -38,56 +38,68 @@ class Chef
         $stdout.sync = true
 
         puts ui.color("Decommissioning SoftLayer VM, this may take a few minutes.", :green)
-
+        connection.servers.each do |server|
+          if config[:ip_address]
+            if server.public_ip_address == config[:ip_address]
+              @instance = server
+              break
+            end
+          elsif config[:chef_node_name]
+            if server.name == config[:chef_node_name]
+              config[:ip_address] = server.public_ip_address
+              @instance = server
+              break
+            end
+          elsif  arg = name_args[0]
+            if arg =~ /^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/ # ipv4
+              if server.public_ip_address == arg
+                @instance = server
+                break
+              end
+            elsif arg =~ /^(?:[A-F0-9]{1,4}:){7}[A-F0-9]{1,4}$/ # ipv6
+              if server.public_ip_address == arg
+                @instance = server
+                break
+              end
+            else
+              if server.name == arg
+                config[:ip_address] = server.public_ip_address
+                @instance = server
+                break
+              end
+            end
+          end              
+        end
+        @instance.nil? and raise "#{ui.color('VM instance with IP: ' + (config[:ip_address].to_s) +' not found!', :red)}"
         @chef = Chef::Search::Query.new
-
-        if config[:chef_node_name]
-          @chef.search('node', "name:#{config[:chef_node_name]}") do |node|
-            config[:ip_address] = node.ipaddress
-            @node = node
-          end
-        elsif config[:ip_address]
-          @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
+        @chef.search('node', "name:#{@instance.name}") do |node|
+          begin
+            @node = node               
+          rescue
           end
-        else
-          raise "#{ui.color("FATAL: Please supply the node name or IP address.", :red)}"
         end
-        @slid = @node.tags.select { |s| s =~ /^slid=/ }.reduce.gsub('slid=', '').to_i
-        @instance = connection.servers.get(@slid)
-
-        @node.nil? and raise "#{ui.color('Chef node not found!', :red)}"
-        @instance.nil? and raise "#{ui.color('VM instance with IP: ' + config[:ip_address] +' not found!', :red)}"
-
 
         begin
-          begin
-            destroy_item(Chef::Node, @node.name, "node")
-            puts ui.color("Chef node successfully deleted.", :green)
-          rescue Exception => e
-            err_msg ui.color("ERROR DELETING CHEF NODE", :red)
-            err_msg ui.color(e.message, :yellow)
-            err_msg ui.color(e.backtrace, :yellow)
-          end
+          if @node
+            begin
+              destroy_item(Chef::Node, @node.name, "node")
+              puts ui.color("Chef node successfully deleted.", :green)
+            rescue Exception => e
+              err_msg ui.color("ERROR DELETING CHEF NODE", :red)
+              err_msg ui.color(e.message, :yellow)
+              err_msg ui.color(e.backtrace.join("\n"), :yellow)
+            end
 
-          begin
-            destroy_item(Chef::ApiClient, @node.name, "client")
-            puts ui.color("Chef client successfully deleted.", :green)
-          rescue Exception => e
-            err_msg ui.color("ERROR DELETING CHEF CLIENT", :red)
-            err_msg ui.color(e.message, :yellow)
-            err_msg ui.color(e.backtrace, :yellow)
+            begin
+              destroy_item(Chef::ApiClient, @node.name, "client")
+              puts ui.color("Chef client successfully deleted.", :green)
+            rescue Exception => e
+              err_msg ui.color("ERROR DELETING CHEF CLIENT", :red)
+              err_msg ui.color(e.message, :yellow)
+              err_msg ui.color(e.backtrace.join("\n"), :yellow)
+            end
+          else
+            "#{ui.color('Chef node: ' + config[:chef_node_name] +' not found! will destroy instance.', :red)}"
           end
 
           begin
@@ -96,7 +108,7 @@ class Chef
           rescue Exception => e
             err_msg ui.color("ERROR DELETING SOFTLAYER VM. IT'S POSSIBLE YOU ARE STILL BEING BILLED FOR THIS INSTANCE.  PLEASE CONTACT SUPPORT FOR FURTHER ASSISTANCE", :red)
             err_msg ui.color(e.message, :yellow)
-            err_msg ui.color(e.backtrace, :yellow)
+            err_msg ui.color(e.backtrace.join("\n"), :yellow)
           end
         ensure
           unless err_msg.empty?

data/lib/chef/knife/softlayer_server_list.rb

@@ -0,0 +1,27 @@
+require 'chef/knife/softlayer_base'
+require 'chef/search/query'
+require 'chef/api_client'
+
+class Chef
+  class Knife
+    class SoftlayerServerList < Knife
+
+      include Knife::SoftlayerBase
+
+      banner 'knife softlayer server list (options)'
+
+      ##
+      # Run the procedure to list all of the Softlayer VM's
+      # @return [nil]
+      def run
+
+        $stdout.sync = true
+        fmt = "%-20s %-8s %-15s %-15s %-10s"
+        puts ui.color(sprintf(fmt, "Name", "Location", "Public IP", "Private IP", "Status"), :green)
+        connection.servers.each do |server|
+          puts sprintf fmt, server.name, server.datacenter, server.public_ip_address, server.private_ip_address, server.created_at ? 'Running' : 'Starting'
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/softlayer_server_relaunch.rb

@@ -7,6 +7,108 @@
 
 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
+
+      ##
+      # 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').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
+
+#
+# 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

data/lib/knife-softlayer/version.rb

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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: knife-softlayer
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.4.0
 platform: ruby
 authors:
 - Matt Eldridge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-softlayer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.29
+        version: 0.3.30
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.29
+        version: 0.3.30
 - !ruby/object:Gem::Dependency
   name: knife-windows
   requirement: !ruby/object:Gem::Requirement
@@ -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_list.rb
 - lib/chef/knife/softlayer_server_relaunch.rb
 - lib/chef/knife/softlayer_vlan_create.rb
 - lib/chef/knife/softlayer_vlan_list.rb