From b8a2b766da962d65c4e86e8a0b05427221516394 Mon Sep 17 00:00:00 2001
From: will <will@cloud.com>
Date: Thu, 17 Mar 2011 16:38:08 -0700
Subject: [PATCH] bug 8208: Added first addHost dialog to take into account
 baremetal requirements in the resource page.

- Standardized the addHost optional parameters for baremetal.
---
 ui/jsp/resource.jsp               | 4 ++--
 ui/scripts/cloud.core.resource.js | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ui/jsp/resource.jsp b/ui/jsp/resource.jsp
index b03207c4f5e..c6362314da2 100644
--- a/ui/jsp/resource.jsp
+++ b/ui/jsp/resource.jsp
@@ -975,8 +975,8 @@
 			<li>
                 <label input_group="general">
                     Tags:</label>
-                <input class="text" type="text" name="host_baremetal_tags" id="host_baremetal_tags" />
-                <div id="host_baremetal_tags_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
+                <input class="text" type="text" name="host_tags" id="host_tags" />
+                <div id="host_tags_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
                 </div>
             </li> 
         </ol>
diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js
index a6a10a6f9bc..6990feb851a 100644
--- a/ui/scripts/cloud.core.resource.js
+++ b/ui/scripts/cloud.core.resource.js
@@ -912,7 +912,8 @@ function initAddHostShortcut() {
                  
 			    array1.push("&hypervisor="+hypervisor);			    
 			    var clustertype = clusterObj.clustertype;
-                array1.push("&clustertype=" + clustertype);				    
+                array1.push("&clustertype=" + clustertype);	
+				array1.push("&hosttags=" + todb(trim($thisDialog.find("#host_tags").val())));
 
 			    if(hypervisor == "VMware") {
 			        var username = trim($thisDialog.find("#host_vcenter_username").val());