From 573a4b1e433d1919e3e22d54de1f94633c3138e4 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessicawang@apache.org>
Date: Wed, 21 Jan 2015 13:44:22 -0800
Subject: [PATCH] volume-upload: tempalates > upload template from local >
 format dropdown > include OVA, VMDK, BareMetal, TAR, VHDX option.

---
 ui/scripts/templates.js | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index 14b8c39f66f..4a1921f1d80 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -791,12 +791,10 @@
                                                     description: 'VHD'
                                                 });
                                             } else if (args.hypervisor == "VMware") {                                                
-                                                /*
                                                 items.push({
                                                     id: 'OVA',
                                                     description: 'OVA'
                                                 });
-                                                */
                                             } else if (args.hypervisor == "KVM") {                                                
                                                 items.push({
                                                     id: 'QCOW2',
@@ -810,48 +808,40 @@
                                                     id: 'VHD',
                                                     description: 'VHD'
                                                 });
-                                                /*
                                                 items.push({
                                                     id: 'VMDK',
                                                     description: 'VMDK'
                                                 });
-                                                */
-                                            } else if (args.hypervisor == "BareMetal") {
-                                                /*
+                                            } else if (args.hypervisor == "BareMetal") {                                                
                                                 items.push({
                                                     id: 'BareMetal',
                                                     description: 'BareMetal'
                                                 });
-                                                */
                                             } else if (args.hypervisor == "Ovm") {                                                
                                                 items.push({
                                                     id: 'RAW',
                                                     description: 'RAW'
                                                 });
-                                            } else if (args.hypervisor == "LXC") {
-                                                /*
+                                            } else if (args.hypervisor == "LXC") {                                                
                                                 items.push({
                                                     id: 'TAR',
                                                     description: 'TAR'
                                                 });
-                                                */
                                             } else if (args.hypervisor == "Hyperv") {
                                             	items.push({
                                                     id: 'VHD',
                                                     description: 'VHD'
                                                 });
-                                                /*
                                                 items.push({
                                                     id: 'VHDX',
                                                     description: 'VHDX'
                                                 });
-                                                */
                                             }
                                             args.response.success({
                                                 data: items
                                             });
                                         }
-                                    },                                   
+                                    },                         
 
                                     osTypeId: {
                                         label: 'label.os.type',