Revert attempt to parametrize allowing destruction of hub disk. hashi…

…corp/terraform#22544
dotmesh-io · Apr 26, 2020 · cff108c · cff108c
1 parent e5ebf9e
commit cff108c
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 22 deletions.
diff --git a/aws/dotscience-aws.tf b/aws/dotscience-aws.tf
@@ -441,12 +441,6 @@ resource "aws_ebs_volume" "ds_hub_volume" {
   tags = {
     Name = "ds-hub-volume-${random_id.default.hex}"
   }
-
-  lifecycle {
-    # Prevent destruction of the hub disk if data loss is not permitted.
-    prevent_destroy = var.permit_data_loss ? false : true
-  }
-
 }
 
 resource "aws_iam_role" "dlm_lifecycle_role" {

diff --git a/aws/variables.tf b/aws/variables.tf
@@ -192,7 +192,3 @@ variable "associate_public_ip" {
   default     = true
 }
 
-variable "permit_data_loss" {
-  description = "Whether to allow hub EBS volume to be deleted - you have to set this to true if you want to destroy the whole stack"
-  default     = false
-}
diff --git a/gcp/dotscience-gcp.tf b/gcp/dotscience-gcp.tf
@@ -132,14 +132,8 @@ resource "google_compute_disk" "dotscience_hub_disk" {
   name     = "dotscience-hub-disk-${random_id.default.hex}"
   type     = "pd-ssd"
   zone     = local.zone
-  size     = var.hub_volume_size
+  size     = 100
   snapshot = var.restore_from_backup
-
-  lifecycle {
-    # Prevent destruction of the hub disk if data loss is not permitted.
-    prevent_destroy = var.permit_data_loss ? false : true
-  }
-
 }
 
 resource "google_compute_disk_resource_policy_attachment" "attachment" {

diff --git a/gcp/variables.tf b/gcp/variables.tf
@@ -109,8 +109,3 @@ variable "restore_from_backup" {
   type        = string
   default     = ""
 }
-
-variable "permit_data_loss" {
-  description = "Whether to allow hub attached disk to be deleted - you have to set this to true if you want to destroy the whole stack"
-  default     = false
-}