From dd76897e678b45b45bc22c08587558ce4fbed84e Mon Sep 17 00:00:00 2001
From: Vincent Fiduccia <vincent@rancher.com>
Date: Tue, 17 Sep 2019 18:03:23 -0700
Subject: [PATCH] Revert "Add standard volume type for AWS (#3351)"

This reverts commit 693f39283a90b1766787235845e428bc10bdac82.
---
 .../components/driver-amazonec2/component.js  |  8 -------
 .../components/driver-amazonec2/template.hbs  | 22 -------------------
 translations/en-us.yaml                       |  3 ---
 3 files changed, 33 deletions(-)

diff --git a/lib/nodes/addon/components/driver-amazonec2/component.js b/lib/nodes/addon/components/driver-amazonec2/component.js
index 868f00c68..6371c1421 100644
--- a/lib/nodes/addon/components/driver-amazonec2/component.js
+++ b/lib/nodes/addon/components/driver-amazonec2/component.js
@@ -13,13 +13,6 @@ import { randomStr } from 'shared/utils/util';
 
 let RANCHER_GROUP         = 'rancher-nodes';
 
-const VOLUME_TYPES = [
-  'gp2',
-  'io1',
-  'st1',
-  'sc1',
-  'standard'
-];
 
 export default Component.extend(NodeDriver, {
   prefs: service(),
@@ -37,7 +30,6 @@ export default Component.extend(NodeDriver, {
   defaultSecurityGroupName: RANCHER_GROUP,
   whichSecurityGroup:       'default',
   instanceTypes:            INSTANCE_TYPES,
-  volumeTypes:              VOLUME_TYPES,
   regionChoices:            REGIONS,
   step:                     1,
   tags:                     null,
diff --git a/lib/nodes/addon/components/driver-amazonec2/template.hbs b/lib/nodes/addon/components/driver-amazonec2/template.hbs
index b41bc51e4..41efc64c8 100644
--- a/lib/nodes/addon/components/driver-amazonec2/template.hbs
+++ b/lib/nodes/addon/components/driver-amazonec2/template.hbs
@@ -391,28 +391,6 @@
         </div>
       </div>
 
-      <div class="row">
-        <div class="col span-6">
-          <label class="acc-label">
-            {{t "nodeDriver.amazonec2.rootVolumeType.label"}}
-          </label>
-          <select
-            id="amazonec2-volume-type-select"
-            class="form-control"
-            onchange={{action (mut config.volumeType) value="target.value"}}
-          >
-            {{#each volumeTypes as |choice|}}
-              <option
-                value={{choice}}
-                selected={{eq config.volumeType choice}}
-              >
-                {{t (concat 'cruStorageClass.aws-ebs.type.' choice)}}
-              </option>
-            {{/each}}
-          </select>
-        </div>
-      </div>
-
       <div class="row">
         <div class="col span-6">
           <label class="acc-label">
diff --git a/translations/en-us.yaml b/translations/en-us.yaml
index fb3200ac0..4a6bb99d6 100644
--- a/translations/en-us.yaml
+++ b/translations/en-us.yaml
@@ -4046,7 +4046,6 @@ cruStorageClass:
       io1: 'IO1 - Provisioned IOPS SSD'
       st1: 'ST1 - Throughput-Optimized HDD'
       sc1: 'SC1 - Cold-Storage HDD'
-      standard: 'Standard - Magnetic'
     zone:
       label: Availability Zone
       automatic: "Automatic: Zones the cluster has a node in"
@@ -6814,8 +6813,6 @@ nodeDriver:
     spotPrice:
       label: Spot Price
       unit: $
-    rootVolumeType:
-      label: Root Volume Type
   digitalocean:
     droplet:
       title: Droplet Options