knife-topo 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0be8df712b7387e67c6aba9af7e0433db88a6e56
-  data.tar.gz: 4cbd85eb38a152561f1db568868c955010babced
+  metadata.gz: a5982dbdd98f486734b60e5f8f7d6db46c18daf2
+  data.tar.gz: 8ba53f9163e5c9883f7098319c9a3955d9c24d14
 SHA512:
-  metadata.gz: 0cff13f858765854b3c791dcf15ce8fafcf054eeb99aab2eb04d1ecedb11a5343962c4c80631b2b2f9ecea8a29b384cde87200e65c2c58b17b12072754fa971d
-  data.tar.gz: 1f5316d287e3e018a03c6cb1f210bd771dc660a02eb5477a2f65396b80160daf37ff2c34445a835c5a580426ac4c5c20e6600e8e7da322c2e29fbc89edf82fce
+  metadata.gz: 1a273459319db01f84a3bdfd1507ef5a1c9f201829087d439473fc38aeb2c68c1eec8c4699971b551081bb4f1ce2e6d85d1e7630eae07ba945326d073d833613
+  data.tar.gz: 644dd730a1e628f4adc3cf2d6f7b3e1f6dcacbb1f1e5e762df157aed9484a14aa0f998d583e760aa9337324ddca0ddc07d18bead4173488d59ed97a73cda9abb

data/README.md

@@ -338,7 +338,7 @@ The following will create the 'test1' topology, and bootstrap it.
 The following will create the 'test1' topology but will not bootstrap it 
 or upload topology cookbooks.
 
-$ knife topo create test1 --disable-upload
+	$ knife topo create test1 --disable-upload
 
 ## knife topo delete <a name="delete"></a>
 
@@ -378,17 +378,17 @@ Option        | Description
 The following will export the data for nodes n1 and n2 as part of a 
 topology called 'my_topo':
 
-	$ knife topo export n1 n2 --topo=my_topo > new_topo.json
+	$ knife topo export n1 n2 --topo my_topo > new_topo.json
 
 	
-The following will export all topologies to a file called 'all_topos.json'.
+The following will export all existing topologies to a file called 'all_topos.json'.
 
 	$ knife topo export --all > all_topos.json
 	
 The following will create an outline for a new topology called  
 'christine_test', or export the current details if it already exists:
 
-	$ knife topo export --topo=christine_test > christine_test.json
+	$ knife topo export --topo christine_test > christine_test.json
 
 
 ## knife topo import <a name="import"></a>

data/lib/chef/knife/topo/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module Topo
-    VERSION = "1.1.0"
+    VERSION = "1.1.2"
   end
 end

data/lib/chef/knife/topo_bootstrap.rb

@@ -34,6 +34,11 @@ class Chef
       :short => '-D DATA_BAG',
       :long => "--data-bag DATA_BAG",
       :description => "The data bag the topologies are stored in"
+      
+      option :overwrite,
+      :long => "--overwrite",
+      :description => "Whether to overwrite existing nodes",
+      :boolean => true
 
       # Make the base bootstrap options available on topo bootstrap
       self.options = (Chef::Knife::Bootstrap.options).merge(self.options)
@@ -65,50 +70,43 @@ class Chef
 
         # load and bootstrap each node that has a ssh_host
         nodes = merge_topo_properties(topo['nodes'], topo)
-        @failed = []
-        skipped = 0
-        succeeded = 0
+          
+        bootstrapped = []
+        skipped = []
+        existed = []
+        failed = [] 
+          
         if nodes.length > 0
           nodes.each do |node_data|
-            if node_data['ssh_host']
-              run_bootstrap(node_data)
-              succeeded += 1             
+            node_name = node_data['name']
+            exists = resource_exists?("nodes/#{node_name}") 
+            if(node_data['ssh_host'] && (config[:overwrite] || !exists))
+              if run_bootstrap(node_data, @bootstrap_args, exists)
+                bootstrapped << node_name
+              else
+                failed << node_name
+              end
             else
-              ui.info "Node #{node_data['name']} does not have ssh_host specified - skipping bootstrap"
-              skipped += 1
+              if(exists)
+                existed << node_name
+              else
+                skipped << node_name
+              end
             end
-
           end
-          ui.info "Bootstrapped #{nodes.length - (@failed.length + skipped)} nodes and skipped #{skipped} nodes of #{nodes.length} in topology #{display_name(topo)}"
-          ui.warn "#{@failed.length} nodes [ #{@failed.join(', ')} ] failed to bootstrap" if @failed.length > 0
+          ui.info("Bootstrapped #{bootstrapped.length} nodes [ #{bootstrapped.join(', ')} ]")
+          ui.info("Skipped #{skipped.length} nodes [ #{skipped.join(', ')} ] because they had no ssh_host information") if skipped.length > 0
+          if existed.length > 0
+            ui.info("Skipped #{existed.length} nodes [ #{existed.join(', ')} ] because they already exist. " +
+              "Specify --overwrite to re-bootstrap existing nodes. " +
+              "If you are using Chef Vault, you may need to use --bootstrap-vault options in this case.")
+          end
+          ui.warn("#{failed.length} nodes [ #{failed.join(', ')} ] failed to bootstrap due to errors") if failed.length > 0
         else
           ui.info "No nodes found for topology #{display_name(topo)}"
         end
       end
 
-      # Setup the bootstrap args and run the bootstrap command
-      def run_bootstrap(node_data)
-        node_name = node_data['name']
-          
-        args = @bootstrap_args
-        args += ['-N', node_name] if(node_name)
-        args += ['-E', node_data['chef_environment']] if(node_data['chef_environment'])
-        args[1] = node_data['ssh_host']
-        args += [ '--ssh-port', node_data['ssh_port']] if node_data['ssh_port']
-        args += [ '--run-list' , node_data['run_list'].join(',')] if node_data['run_list']
-        args += [ '--json-attributes' , node_data['normal'].to_json] if node_data['normal']
-
-        ui.info "Bootstrapping node #{node_name}"
-        begin
-          run_cmd(Chef::Knife::Bootstrap, args)
-        rescue Exception => e
-          raise if Chef::Config[:verbosity] == 2
-          @failed << node_name
-          ui.warn "bootstrap of node #{node_name} exited with error"
-          humanize_exception(e)
-        end
-      end
-
       include Chef::Knife::TopologyHelper
 
     end

data/lib/chef/knife/topo_cookbook_create.rb

@@ -151,7 +151,7 @@ class Chef
           
           # Print out qualified attributes
           def print_qualified_attr(file, qualifier_hash)
-            file.puts "if node['topo']['#{qualifier_hash['qualifier']}'] == \"#{qualifier_hash['value']}\""
+            file.puts "if node['topo'] && node['topo']['#{qualifier_hash['qualifier']}'] == \"#{qualifier_hash['value']}\""
             print_priority_attrs(file, qualifier_hash, 2)
             file.puts "end"
           end

data/lib/chef/knife/topo_create.rb

@@ -27,7 +27,7 @@ class Chef
       
       deps do
         Chef::Knife::TopoCookbookUpload.load_deps
-        Chef::Knife::TopoBootstrap.load_deps
+        Chef::Knife::Bootstrap.load_deps
       end
 
       banner "knife topo create TOPOLOGY (options)"
@@ -46,19 +46,24 @@ class Chef
       :long => "--disable-upload",
       :description => "Do not upload topo cookbooks",
       :boolean => true
+      
+      option :overwrite,
+      :long => "--overwrite",
+      :description => "Whether to overwrite existing nodes",
+      :boolean => true
             
       # Make called command options available
       opts = self.options
-      self.options = (Chef::Knife::TopoBootstrap.options).merge(Chef::Knife::TopoCookbookUpload.options)
+      self.options = (Chef::Knife::Bootstrap.options).merge(Chef::Knife::TopoCookbookUpload.options)
       self.options.merge!(opts)
 
       def initialize (args)
         super
-        @topo_bootstrap_args  = initialize_cmd_args(args, [ 'topo', 'bootstrap', @name_args[0] ])
+        @bootstrap_args  = initialize_cmd_args(args, [ 'bootstrap', '' ])
         @topo_upload_args  = initialize_cmd_args(args, [ 'topo', 'cookbook', 'upload', @name_args[0] ])
 
         # All called commands need to accept union of options
-        Chef::Knife::TopoBootstrap.options = options
+        Chef::Knife::Bootstrap.options = options
         Chef::Knife::TopoCookbookUpload.options = options
       end
       
@@ -99,20 +104,55 @@ class Chef
         nodes = merge_topo_properties(topo_hash['nodes'], topo_hash)
         config[:disable_editing] = true
         
+        bootstrapped = []
+        updated = []
+        skipped = []
+        failed = [] 
+        
         if nodes && nodes.length > 0
-          nodes.each do |updates|
-            node_name = updates['name']
-            node = update_node(updates)
+                 
+          nodes.each do |node_data|
+            node_name = node_data['name']
+            
+            exists = resource_exists?("nodes/#{node_name}") 
+            if(node_data['ssh_host'] && config[:bootstrap] && (config[:overwrite] || !exists))
+              if run_bootstrap(node_data, @bootstrap_args, exists)
+                bootstrapped << node_name
+              else
+                failed << node_name
+              end
+            else
+              if(exists)
+                updated << node_name
+                node = update_node(node_data)                  
+              else
+                skipped << node_name
+              end
+            end
+          end
+  
+          ui.info("Topology #{display_name(topo_hash)} created, containing #{nodes.length} nodes")
+          ui.info("Build information: " + topo_hash['buildstamp']) if topo_hash['buildstamp']
+          
+          if(config[:bootstrap])
+            ui.info("Bootstrapped #{bootstrapped.length} nodes [ #{bootstrapped.join(', ')} ]")
+            if updated.length > 0
+              ui.info("Updated #{updated.length} nodes [ #{updated.join(', ')} ] because they already exist. " +
+                "Specify --overwrite to re-bootstrap existing nodes. " +
+                "If you are using Chef Vault, you may need to use --bootstrap-vault options in this case.")
+            end
+            ui.info("Skipped #{skipped.length} nodes [ #{skipped.join(', ')} ] because they had no ssh_host information") if skipped.length > 0
+          else
+            ui.info("Updated #{updated.length} nodes [ #{updated.join(', ')} ]")
+            ui.info("Skipped #{skipped.length} nodes [ #{skipped.join(', ')} ] because they do not exist") if skipped.length > 0
           end
-          # if bootstrap is specified, run the bootstrap command
-          run_cmd(Chef::Knife::TopoBootstrap, @topo_bootstrap_args) if config[:bootstrap]
+          
+          ui.warn("#{failed.length} nodes [ #{failed.join(', ')} ] failed to bootstrap due to errors") if failed.length > 0
+               
         else
           ui.info "No nodes found for topology #{display_name(topo_hash)}"
         end
-
-        ui.info("Topology #{display_name(topo_hash)} created")
-        ui.info("Build information: " + topo_hash['buildstamp']) if topo_hash['buildstamp']
-              
+             
       end
 
       include Chef::Knife::TopologyHelper      

data/lib/chef/knife/topo_delete.rb

@@ -75,8 +75,8 @@ class Chef
           # load then update and save the node
           node = Chef::Node.load(node_name)
           
-          if node.normal['topo'] && node.normal['topo']['name'] == @topo_name
-            node.normal['topo'].delete('name') 
+          if node['topo'] && node['topo']['name'] == @topo_name
+            node.rm('topo','name') 
             ui.info "Removing node #{node.name} from topology"
             node.save
           end

data/lib/chef/knife/topo_list.rb

@@ -37,8 +37,12 @@ class Chef
 
       def run
 
-        topo_bag = topo_bag_name(config[:data_bag])
-        output(format_list_for_display(Chef::DataBag.load(topo_bag)))
+        begin
+          topo_bag = topo_bag_name(config[:data_bag])
+          output(format_list_for_display(Chef::DataBag.load(topo_bag)))
+        rescue Net::HTTPServerException => e
+          raise unless e.to_s =~ /^404/
+        end
 
       end
       

data/lib/chef/knife/topology_helper.rb

@@ -21,6 +21,7 @@ require 'chef/node'
 require 'chef/encrypted_data_bag_item'
 require 'chef/environment'
 require 'chef/knife/core/object_loader'
+require 'chef/rest'
 
 class Chef
   class Knife
@@ -104,7 +105,8 @@ class Chef
           merged_nodes = nodes ? nodes.clone : []
           merged_nodes.each do |nodeprops|
 
-            normal_defaults = topo_hash['normal'] ? topo_hash['normal'].clone : {}
+            normal_defaults = topo_hash['normal'] ? 
+              Marshal.load(Marshal.dump(topo_hash['normal'])) : {}
             nodeprops['normal'] ||= {}
             nodeprops['normal'] = prop_merge!(normal_defaults, nodeprops['normal'])
             nodeprops['normal'] = prop_merge!(nodeprops['normal'], nodeprops['attributes']) if nodeprops['attributes']
@@ -309,6 +311,55 @@ class Chef
         
         version
       end
+      
+      # check if resource exists
+      def resource_exists?(relative_path)
+        rest.get_rest(relative_path)
+        true
+      rescue Net::HTTPServerException => e
+        raise unless e.response.code == "404"
+        false
+      end
+      
+      # Setup the bootstrap args and run the bootstrap command
+      def run_bootstrap(node_data, bootstrap_args, overwrite=false)
+        node_name = node_data['name']
+          
+        args = bootstrap_args
+        
+        # We need to remove the --bootstrap option, if it exists, because its not valid for knife bootstrap
+        args -= ['--bootstrap']
+          
+        # And set up the node-specific data
+        args += ['-N', node_name] if(node_name)
+        args += ['-E', node_data['chef_environment']] if(node_data['chef_environment'])
+        args[1] = node_data['ssh_host']
+        args += [ '--ssh-port', node_data['ssh_port']] if node_data['ssh_port']
+        args += [ '--run-list' , node_data['run_list'].join(',')] if node_data['run_list']
+        args += [ '--json-attributes' , node_data['normal'].to_json] if node_data['normal']
+        
+        if overwrite
+          ui.info("Node #{node_name} exists and will be overwritten")
+          # delete node first so vault refresh does not pick up existing node
+          begin
+            rest.delete("nodes/#{node_name}")
+            rest.delete("clients/#{node_name}")
+          rescue Net::HTTPServerException => e
+            raise unless e.response.code == "404"
+          end
+        end
+      
+        ui.info "Bootstrapping node #{node_name}"
+        begin
+          run_cmd(Chef::Knife::Bootstrap, args)
+          true
+        rescue Exception => e
+          raise if Chef::Config[:verbosity] == 2
+          ui.warn "bootstrap of node #{node_name} exited with error"
+          humanize_exception(e)
+          false
+        end
+      end
 
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-topo
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Christine Draper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies: []
 description: Knife-topo uses a JSON file to capture a topology of nodes, which can
   be loaded into Chef and bootstrapped
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Knife plugin to manage topologies of nodes