single root drive 30 change, remove secondary drive

quintilesims · Apr 1, 2021 · c746e3c · c746e3c
1 parent 5e72403
commit c746e3c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/api/backend/ecs/environment_manager.go b/api/backend/ecs/environment_manager.go
@@ -203,8 +203,7 @@ func (e *ECSEnvironmentManager) CreateEnvironment(
 	launchConfigurationName := ecsEnvironmentID.LaunchConfigurationName()
 	volSizes := make(map[string]int)
 	if operatingSystem == "linux" {	
-		volSizes["/dev/xvda"] = 30;
-		volSizes["/dev/xvdcz"] = 22; 		
+		volSizes["/dev/xvda"] = 30;	
 	} else {
 		volSizes["/dev/sda1"] = 200
 	}

diff --git a/api/backend/ecs/environment_manager_test.go b/api/backend/ecs/environment_manager_test.go
@@ -381,7 +381,7 @@ func TestCreateEnvironment(t *testing.T) {
 					reporter.AssertEqualf("m3.medium", *instanceType, "Instance Type")
 					reporter.AssertEqualf(config.TEST_AWS_KEY_PAIR, *keyName, "KeyPair")
 					reporter.AssertEqualf(securityGroupID, *securityGroups[0], "SecurityGroupID 0")
-					reporter.AssertEqualf(volSizes, map[string]int{"/dev/xvda": 30,"/dev/xvdcz": 22}, "Volume Sizes")
+					reporter.AssertEqualf(volSizes, map[string]int{"/dev/xvda": 30}, "Volume Sizes")
 
 					return nil
 				}

diff --git a/setup/module/api/environment.tf b/setup/module/api/environment.tf
@@ -47,12 +47,6 @@ resource "aws_launch_configuration" "api" {
     volume_type           = "gp2"
     volume_size           = "30"
   }
-  ebs_block_device {
-    delete_on_termination = true
-    device_name           ="/dev/xvdcz"
-    volume_type           = "gp2"
-    volume_size           = "22"
-  }
 
   lifecycle {
     create_before_destroy = true