Merge pull request #128 from byxorna/gh-pages

add documentation for feature added in #123
tumblr · Mar 7, 2014 · 2eb8ae2 · 2eb8ae2
2 parents dc5399d + a741153
commit 2eb8ae2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/_includes/api_assets_update.html b/_includes/api_assets_update.html
@@ -19,12 +19,12 @@ <h2>Asset Update</h2>
             <tr>
               <th class="inlinecode">lshw</th>
               <td>String</td>
-              <td>Only accepted when the asset is Incomplete. Should be the XML output from running the lshw command on the asset.</td>
+              <td>Only accepted when the asset is Incomplete, Maintenance, or states specified in allowedServerUpdateStatuses. Should be the XML output from running the lshw command on the asset.</td>
             </tr>
             <tr>
               <th class="inlinecode">lldp</th>
               <td>String</td>
-              <td>Only accepted when the asset is Incomplete. Should be the XML output from running the lldp command on the asset.</td>
+              <td>Only accepted when the asset is Incomplete, Maintenance, or states specified in allowedServerUpdateStatuses. Should be the XML output from running the lldp command on the asset.</td>
             </tr>
             <tr>
               <th class="inlinecode">groupId</th>
@@ -39,7 +39,7 @@ <h2>Asset Update</h2>
             <tr>
               <th class="inlinecode">CHASSIS_TAG</th>
               <td>Option[String]</td>
-              <td>Only accepted for Incomplete assets during the intake phase</td>
+              <td>Only accepted for Incomplete assets during the intake phase, Maintenance, or states specified in allowedServerUpdateStatuses.</td>
             </tr>
             <tr>
               <th class="inlinecode">RACK_POSITION</th>

diff --git a/_includes/config_features.html b/_includes/config_features.html
@@ -20,6 +20,11 @@
       <td>String</td>
       <td>A set of managed tags that can be updated for non-server assets</td>
     </tr>
+    <tr>
+      <td class="inlinecode">allowedServerUpdateStatuses</td>
+      <td>Set[String]</td>
+      <td>A set of statuses in which collins will accept LLDP/LSHW/CHASSIS_TAG updates for server assets. Maintenance is always a member of this set, even if not specified.</td>
+    </tr>
     <tr>
       <td class="inlinecode">defaultLogType</td>
       <td>String</td>
@@ -98,6 +103,8 @@
 <pre>features {
   allowTagUpdates = []
 
+  allowedServerUpdateStatuses = []
+
   defaultLogType = Informational
 
   deleteIpmiOnDecommission = true
@@ -134,6 +141,8 @@
     <div id="feature-ex" class="accordion-body collapse in">
       <div class="accordion-inner">
 <pre>features {
+  allowedServerUpdateStatuses = [ PROVISIONED, PROVISIONING ]
+
   encryptedTags = [SYSTEM_PASSWORD, LOCATION]
 
   noLogAssets = [chatty_config, other_chatty_config]