knife-topo 0.0.4 → 0.0.5

data/README.md

@@ -24,19 +24,19 @@ This plugin has been tested with Chef Version 11.12 on Ubuntu 14.04 LTS.
 
 # Usage #
 
-Define one or more topologies in a [topology file](#markdown-header-topology-file). 
+Define one or more topologies in a [topology file](#topology-file). 
 
 Import the topology file into your local chef repo using
-[knife topo import](#markdown-header-knife-topo-import). Create and optionally
+[knife topo import](#import). Create and optionally
 bootstrap a topology on the Chef server using 
-[knife topo create](#markdown-header-knife-topo-create), and update it
-using [knife topo update](#markdown-header-knife-topo-update).
+[knife topo create](#create), and update it
+using [knife topo update](#update).
 
 # Getting Started #
 
-Try out this plugin using a [test repo](knife-topo/src/master/test-repo) 
+Try out this plugin using a [test repo](test-repo) 
 which you can download from Github or is included in the installed gem. See the 
-[Instructions](knife-topo/src/master/test-repo/Instructions.md) for a
+[Instructions](Instructions.md) for a
 demo script, explanation, and troubleshooting.
 
 The instructions assume you have
@@ -44,17 +44,17 @@ The instructions assume you have
  or equivalent installed and working with Vagrant and VirtualBox, but
  none of these are requirements for this plugin. 
 
-# Topology File #
+# Topology File <a name="topology-file"></a>#
 
-See the [example topology file](knife-topo/src/master/test-repo/topology.json)
+See the [example topology file](test-repo/topology.json)
 
 The topology file contains a single topology, or an array of topologies.
 Each topology has some overall properties, an array of nodes and 
 an array defining topology cookbook attributes.
 
-## Overall Properties
+## Overall Topology Properties <a name="topology-properties"></a>
 
-```json
+```
     {
         "name": "test1",
         "chef_environment": "test",
@@ -69,7 +69,7 @@ an array defining topology cookbook attributes.
         ],
         "cookbook_attributes" : [
         ]
-    },
+    }
 ```
 The `name` is how you will refer to the topology in the
 `knife topo` subcommands.
@@ -79,13 +79,13 @@ here will be applied to all nodes in the topology, unless alternative
 values are provided for a specific node.  The `tags` 
 will be added to each node. 
     
-## Node List
+## Node List <a name="node-list"></a>
 Each topology contains a list of `nodes`.
 
-```json
-    "{
+```
+    {
         "name": "test1",
-        ...,
+        ...
         "nodes": {
             "buildserver": {
                 "name": "buildserver01",
@@ -94,8 +94,9 @@ Each topology contains a list of `nodes`.
                 "chef_environment": "dev",
                 "run_list": ["role[base-ubuntu]", "ypo::db", "recipe[ypo::appserver]"],
                 "normal": {
-                  "topo.node_type": "buildserver",
-                  "another": "Value 1"
+                  "topo" : {
+                    node_type": "buildserver"
+                  }
                 },
                 "tags": ["build"]
             },
@@ -114,14 +115,14 @@ fields are optional.
 The `ssh_host` and `ssh_port` are optional fields that are used to
 bootstrap a node.
 
-## Topology Cookbook Attributes
+## Topology Cookbook Attributes <a name="cookbook-attributes"></a>
 
 Each topology may have attributes that are set via
 an attribute file in a topology-specific cookbook. Each
 attribute file is described in an entry in the 'cookbook_attributes'
 array.
 
-```json
+```
 	"cookbook_attributes": [
 		{
 			"cookbook": "testsys_test1",
@@ -168,27 +169,27 @@ in the above) will generate an entry in the attribute file such as:
 Attributes listed under the `conditional` property will generate an 
 entry in the attribute file such as:
 
-```ruby
+```
   if (node['topo']['node_type'] == "buildserver")
-    normal['mongodb'][package_version] = "2.5.1"
+    normal['mongodb']['package_version'] = "2.5.1"
   end
 ```
 
-# Subcommands #
+# Subcommands <a name="subcommands"></a>
 
 The main subcommands for `knife topo` are:
 
-* `knife topo import` - Import one or more into your workspace/local repo
-* `knife topo create` - Create and optionally bootstrap a topology of nodes
-* `knife topo update` - Update a topology of nodes
+* [knife topo import](#import) - Import one or more into your workspace/local repo
+* [knife topo create](#create) - Create and optionally bootstrap a topology of nodes
+* [knife topo update](#update) - Update a topology of nodes
 
 The additional subcommands can also be useful, depending on your
 workflow:
 
-* `knife topo bootstrap` - Bootstraps a topology of nodes
-* `knife topo cookbook create` - Generate the topology cookbooks
-* `knife topo cookbook upload` - Upload the topology cookbooks
-* `knife export` - Export data from a topology (or from nodes that you want in a topology)
+* [knife topo bootstrap](#bootstrap)- Bootstraps a topology of nodes
+* [knife topo cookbook create](#cookbook-create) - Generate the topology cookbooks
+* [knife topo cookbook upload](#cookbook-upload) - Upload the topology cookbooks
+* [knife export](#export) - Export data from a topology (or from nodes that you want in a topology)
 
 The topologies are data bag items in the 'topologies' data bag, so 
 you can also use knife commands such as:
@@ -205,7 +206,7 @@ Option        | Description
 ------------  | -----------
 -D, --data-bag DATA_BAG    | The data bag to use for the topologies. Defaults to 'topologies'.
 
-## knife topo bootstrap
+## knife topo bootstrap <a name="bootstrap"></a>
 
 	knife topo bootstrap TOPOLOGY
 
@@ -228,12 +229,12 @@ user name of vagrant, password of vagrant, and running using sudo.
 
 	$ knife topo bootstrap sys1_test test1 -x vagrant -P vagrant --sudo
 
-## knife topo cookbook create 
+## knife topo cookbook create <a name="cookbook-create"></a>
 
 	knife topo cookbook create TOPOLOGY
 
 Generates the topology cookbook attribute files and attributes described in the 
-'cookbook_attributes' property.
+[cookbook_attributes](#cookbook-attributes) property.
 
 ### Options:
 
@@ -241,7 +242,7 @@ The knife topo cookbook create subcommand supports the following additional opti
 
 Option        | Description
 ------------  | -----------
-See [knife cookbook create](http://docs.opscode.com/chef/knife.html#cookbook)  |  
+See [knife cookbook create](http://docs.opscode.com/chef/knife.html#cookbook)  |   Options supported by `knife cookbook create` are passed through
 
 ### Examples:
 The following will generate the topology cookbook attribute files for
@@ -249,7 +250,7 @@ topology test1.
 
 	$ knife topo cookbook create test1
 
-## knife topo cookbook upload 
+## knife topo cookbook upload <a name="cookbook-upload"></a>
 
 	knife topo cookbook upload TOPOLOGY
 
@@ -261,7 +262,7 @@ The knife topo cookbook upload subcommand supports the following additional opti
 
 Option        | Description
 ------------  | -----------
-See [knife cookbook upload](http://docs.opscode.com/chef/knife.html#cookbook)  | 
+See [knife cookbook upload](http://docs.opscode.com/chef/knife.html#cookbook)  |  Options supported by `knife cookbook upload` are passed through
 
 
 ### Examples:
@@ -271,7 +272,7 @@ topology test1.
 	$ knife topo cookbook create test1
 	
   
-## knife topo create 
+## knife topo create <a name="create"></a>
 
 	knife topo create TOPOLOGY
 
@@ -288,7 +289,7 @@ The knife topo create subcommand supports the following additional options.
 
 Option        | Description
 ------------  | -----------
---bootstrap    | Bootstrap the topology (see [topo bootstrap](#markdown-header-knife-topo-bootstrap))
+--bootstrap    | Bootstrap the topology (see [topo bootstrap](#bootstrap))
 See [knife bootstrap](http://docs.opscode.com/knife_bootstrap.html)  | Options supported by `knife bootstrap` are passed through to the bootstrap command
 --no-upload   | Do not upload topology cookbooks
 
@@ -302,7 +303,7 @@ or upload topology cookbooks.
 
 $ knife topo create test1 --no-upload
 
-## knife topo export 
+## knife topo export <a name="export"></a>
 
 	knife topo export [ TOPOLOGY [ NODE ... ] 
 
@@ -310,11 +311,10 @@ Exports the specified topology as JSON. If the topology does not already exist,
 an outline for a new topology will be exported. The exported JSON
 can be used as the basis for a new topology definition.
 
-If nodes are specified, these will be added into the export in addition
+If nodes are specified, these will be exported in addition
 to any nodes that are in the topology. 
 
-If no topology is specified, all existing topologies in that environment 
-will be exported.
+If no topology is specified, all defined topologies will be exported.
 
 ### Examples:
 The following will export all topologies to a file called 'sys1_test.json'.
@@ -326,7 +326,7 @@ The following will create an outline for a new topology called  'christine_test'
 	$ knife topo export christine_test > christine_test.json
 
 
-## knife topo import 
+## knife topo import <a name="import"></a>
 
 	knife topo import [ TOPOLOGY_FILE [ TOPOLOGY ... ]] 
 
@@ -346,7 +346,7 @@ The following will import the 'test1' topology
 
 	$ knife topo import topology.json test1
 
-## knife topo update
+## knife topo update <a name="update"></a>
 
 	knife topo update [ TOPOLOGY ] 
 

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

@@ -1,5 +1,5 @@
 module Knife
   module Topo
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/lib/chef/knife/topo_bootstrap.rb

@@ -89,12 +89,14 @@ class Chef
       # 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

data/lib/chef/knife/topo_create.rb

@@ -91,14 +91,25 @@ class Chef
         # make sure env and cookbooks are in place
         check_chef_env(topo['chef_environment']) if topo['chef_environment']
         upload_cookbooks(@topo_upload_args) if (!config[:no_upload])  
-          
-        # setup the actual nodes on the server
-        create_or_update_nodes(topo)
-        ui.info("Topology created")
-        
-        # if bootstrap is specified, run the bootstrap command
-        run_cmd(Chef::Knife::TopoBootstrap, @topo_bootstrap_args) if config[:bootstrap]
+
+        # update any existing nodes
+        topo_hash = topo.raw_data
+        nodes = merge_topo_properties(topo_hash['nodes'], topo_hash)
+        config[:disable_editing] = true
         
+        if nodes.length > 0
+          nodes.each do |updates|
+            node_name = updates['name']
+            node = update_node(updates)
+          end
+          # if bootstrap is specified, run the bootstrap command
+          run_cmd(Chef::Knife::TopoBootstrap, @topo_bootstrap_args) if config[:bootstrap]
+        else
+          ui.info "No nodes found for topology #{topo_hash.name}"
+        end
+           
+        ui.info("Topology created")
+              
       end
       
 

data/lib/chef/knife/topo_export.rb

@@ -48,6 +48,7 @@ class Chef
             export = topo.raw_data
           else
             export = empty_topology
+            export['nodes'].push(empty_node("node1")) if @node_names.length == 0
           end
 
           # merge in data for nodes that user explicitly specified
@@ -78,9 +79,7 @@ class Chef
           "chef_environment" => "_default",
           "tags" => [ ],
           "normal" => { },
-          "nodes" => [
-          "node1" => empty_node("node1")
-          ],
+          "nodes" => [ ],
           "cookbook_attributes" => [{
             "cookbook" =>  @topo_name || "topo1",
             "filename" => "topology"
@@ -115,7 +114,7 @@ class Chef
           
         rescue Net::HTTPServerException => e
           raise unless e.to_s =~ /^404/
-          node = empty_node(node_name)
+          node_data = empty_node(node_name)
         end
         
         node_data
@@ -125,10 +124,10 @@ class Chef
       def merge_node_properties!(nodes, node_name)
         # find out if the node is already in the array
         found = nodes.index{|n| n["name"] == node_name }
-        if found
-          nodes[found] = node_export(node_name)
-        else
+        if found.nil?
           nodes.push(node_export(node_name))
+        else
+          nodes[found] = node_export(node_name)
         end
       end
 

data/lib/chef/knife/topo_update.rb

@@ -99,8 +99,21 @@ class Chef
       def update_topo(topo)
         topo.save
         @topo_upload_args[3] = topo['name']
-        upload_cookbooks(@topo_upload_args) if (!config[:no_upload])           
-        create_or_update_nodes(topo)
+        upload_cookbooks(@topo_upload_args) if (!config[:no_upload]) 
+
+        topo_hash = topo.raw_data
+        nodes = merge_topo_properties(topo_hash['nodes'], topo_hash)
+        config[:disable_editing] = true
+        
+        if nodes.length > 0
+          nodes.each do |updates|
+            node_name = updates['name']
+            node = update_node(updates)
+            ui.info "Node #{node_name} does not exist - skipping update" if (!node)
+          end
+        else
+          ui.info "No nodes found for topology #{topo_hash.name}"
+        end
       end
 
       include Chef::Knife::TopologyHelper

data/lib/chef/knife/topology_helper.rb

@@ -119,46 +119,37 @@ class Chef
 
       end
 
-      # Get nodes from the topology, create them and/or set their run lists
-      def create_or_update_nodes(topo)
-
-        topo_hash = topo.raw_data
-        nodes = merge_topo_properties(topo_hash['nodes'], topo_hash)
-        config[:disable_editing] = true
-
-        if nodes.length > 0
-         nodes.each do |updates|
-            node_name = updates['name']
-            begin
-              
-              # load then update and save the node
-              node = Chef::Node.load(node_name)
-              
-              if updates['chef_environment'] && updates['chef_environment'] != node['chef_environment']
-                check_chef_env(topo['chef_environment']) 
-              end
-              
-              if updated_values = update_node_with_values(node, updates)
-                ui.info "Updating #{updated_values.join(', ')} on node #{node.name}"
-                node.save
-                ui.output(format_for_display(node)) if config[:print_after]
-              else
-                ui.info "No  updates found for node #{node.name}"
-              end
-
-            rescue Net::HTTPServerException => e
-              raise unless e.to_s =~ /^404/
-              # Create the node
-              node = Chef::Node.new
-              node.name(node_name)
-              update_node_with_values(node, updates)
-              create_object(node)
-            end
+      
+    # Update an existing node
+    def update_node(node_updates)
+    
+      config[:disable_editing] = true
+    
+      node_name = node_updates['name']
+      begin
+        
+        # load then update and save the node
+        node = Chef::Node.load(node_name)
+        
+        if node_updates['chef_environment'] && node_updates['chef_environment'] != node['chef_environment']
+          check_chef_env(node_updates['chef_environment']) 
         end
+        
+        if updated_values = update_node_with_values(node, node_updates)
+          ui.info "Updating #{updated_values.join(', ')} on node #{node.name}"
+          node.save
+          ui.output(format_for_display(node)) if config[:print_after]
         else
-          ui.info "No nodes found for topology #{topo_hash.name}"
+          ui.info "No  updates found for node #{node.name}"
         end
+
+      rescue Net::HTTPServerException => e
+        raise unless e.to_s =~ /^404/
+        # Node has not been created
       end
+      
+      return node
+    end
 
       # Make updates into the original node, returning the list of updated properties.
       def update_node_with_values(node, updates)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-topo
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-20 00:00:00.000000000 Z
+date: 2014-07-21 00:00:00.000000000 Z
 dependencies: []
 description: Knife plugin that to manage topologies of nodes
 email: