Merge branch 'master' into 3.2

confluent_client/doc/man/collate.ronn

@@ -22,7 +22,7 @@ node and group names sorted alphanumerically.
    output suggests a large number of nodes are unreachable, abbreviate
    showing 'rack1' as being unreachable may make more obvious a possible cause.
    
-* `-b`, `--base`:
+* `-b BASE`, `--base=BASE`:
    Use given node as reference for comparison when using
    -d, instead of using the most common result      
 
@@ -44,16 +44,19 @@ node and group names sorted alphanumerically.
    
 * `-c`, `--count`:
    Print a count of the number of nodes in an output group under the 
-  noderange.
+   noderange.
   
- * `-r`, `--reverse`:
-    Rather than starting with most common to least common, start with
-    the least common and print the most common last.
+* `-r`, `--reverse`:
+   Rather than starting with most common to least common, start with
+   the least common and print the most common last.
     
-* `-l`, `--log`:
+* `-l LOG`, `--log=LOG`:
    Save output per node to individual log files, replacing {node} in the name
    with the nodename of each
    
+* `-h`, `--help`:
+   Show help message and exit   
+   
 ## EXAMPLES
  * Organizing power state of multiple nodes:  
   `# nodepower n1-n12 | collate`  

confluent_client/doc/man/collective.ronn

@@ -37,6 +37,9 @@ on circumstances.
 
  * `-i`:
     Provide the token as an argument rather than interactively.
+    
+* `-h`, `--help`:
+  Show help message and exit    
    
 ## EXAMPLES
  * Inviting a server called mgt2:

confluent_client/doc/man/confetty.ronn

@@ -17,15 +17,18 @@ the various function specific commands.
 
 ## OPTIONS
 
-* `-s`, `--server`:
+* `-s SERVER:PORT`, `--server=SERVER:PORT`:
   Confluent instance to connect to
 
-* `-c`, `--control`:
+* `-c PATH`, `--control=PATH`:
   Path to offer terminal control
 
-* `-m`, `--mintime`:
+* `-m MINTIME`, `--mintime=MINTIME`:
   Minimum time to run or else pause for input (used to
   keep a terminal from closing quickly on error)
+  
+* `-h`, `--help`:
+  Show help message and exit  
 
 ## COMMANDS
 

confluent_client/doc/man/nodegroupattrib.ronn.tmpl

@@ -36,6 +36,9 @@ the attributes are set on the node versus a group to which a node belongs.
   
 * `-p`, `--prompt`:
   Prompt for attribute values interactively
+  
+* `-h`, `--help`:
+  Show help message and exit  
 
 ## EXAMPLES
 

confluent_client/doc/man/nodelicense.ronn

@@ -9,7 +9,7 @@ nodelicense(8) -- Manage license keys on BMC
 
 `nodelicense` manages license keys on supported BMCs. Without an argument, the command
 lists currently installed license.  Using `delete` will remove the specified license name
-from th eBMC.  The `save` subcommand will take the passed directory (which may be in the form
+from the BMC.  The `save` subcommand will take the passed directory (which may be in the form
 of /path/to/{node}/ to have the node name substituted for each node) and back up installed licenses
 to that directory. The `install` command will take the specified filename and install.  The filename
 argument may be of the form  xcc_fod_0034_7X21{id.serial}.key to have the serial number substituted
@@ -17,5 +17,8 @@ to allow unique licenses to be specified in a single command.
 
 ## OPTIONS
 
-* `-m`, `--maxnodes`:
+* `-m MAXNODES`, `--maxnodes=MAXNODES`:
   Specify a maximum number of nodes to delete licenses from, prompting if over the threshold
+  
+* `-h`, `--help`:
+  Show help message and exit

confluent_client/doc/man/nodepower.ronn

@@ -31,6 +31,10 @@ off will not react to this request.
 * `-p`, '--showprevious':
    Show previous power state for all directives that may change power state.
    
+* `-m MAXNODES`, `--maxnodes=MAXNODES`:
+   Specify a maximum number of nodes to change power state, prompting if
+   over the threshold
+   
 * `-h`, `--help`:
   Show help message and exit   
 

confluent_client/doc/man/noderemove.ronn

@@ -11,9 +11,12 @@ noderemove(8) -- Remove nodes from the confluent management service
 
 ## OPTIONS
 
-* `-m`, `--maxnodes`:
+* `-m MAXNODES`, `--maxnodes=MAXNODES`:
     Specify a maximum number of nodes to delete, prompting if over the
     threshold
+    
+* `-h`, `--help`:
+  Show help message and exit    
 
 ## EXAMPLES
 
@@ -27,4 +30,3 @@ noderemove(8) -- Remove nodes from the confluent management service
     `r2u3: deleted`  
     `r2u2: deleted`  
     `r2u1: deleted`  
-

confluent_client/doc/man/nodereseat.ronn

@@ -13,8 +13,11 @@ the chassis and putting it back in, but without actually having to do so.
 
 ## OPTIONS
 
-* `-m`, `--maxnodes`:
+* `-m MAXNODES`, `--maxnodes=MAXNODES`:
     Specify a maximum number of nodes to reseat, prompting if over the threshold
+    
+* `-h`, `--help`:
+  Show help message and exit    
 
 ## EXAMPLES
 

confluent_client/doc/man/nodersync.ronn

@@ -17,7 +17,9 @@ noderange. This will present progress as percentage for all nodes.
   exceeds the count, then excess nodes will wait until one of the
   active count completes. 
   
-* `-m`, `--maxnodes`:
+* `-m MAXNODES`, `--maxnodes=MAXNODES`:
   Specify a maximum number of nodes to run rsync to, prompting if over the
   threshold
   
+* `-h`, `--help`:
+  Show help message and exit

confluent_client/doc/man/nodesupport.ronn

@@ -21,9 +21,12 @@ specific suffixes added to any file produced.
 
 ## OPTIONS
 
-* `-m`, `--maxnodes`:
+* `-m MAXNODES`, `--maxnodes=MAXNODES`:
   Specify a maximum number of nodes to download diagnostic data from, prompting
-    if over the threshold
+  if over the threshold
+  
+* `-h`, `--help`:
+  Show help message and exit  
 
 ## EXAMPLES
 

confluent_server/confluent/plugins/hardwaremanagement/ipmi.py

@@ -749,6 +749,10 @@ class IpmiHandler(object):
                             self.node, 'Invalid prefix length given'))
                     else:
                         raise
+        elif len(self.element) == 4 and self.element[-1] != 'management':
+            self.output.put(
+                    msg.ConfluentTargetNotFound(self.node,
+                                                'Interface not found'))
 
     def handle_users(self):
         # Create user

confluent_server/confluent/plugins/hardwaremanagement/redfish.py

@@ -608,6 +608,10 @@ class IpmiHandler(object):
                             self.node, 'Invalid prefix length given'))
                     else:
                         raise
+        elif len(self.element) == 4 and self.element[-1] != 'management':
+            self.output.put(
+                    msg.ConfluentTargetNotFound(self.node,
+                                                'Interface not found'))
 
     def handle_users(self):
         # Create user