aboutsummaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2018-06-03 13:06:30 +0100
committerChristopher Baines <mail@cbaines.net>2018-06-03 14:09:13 +0100
commit93c1c6e5b76ed712f6c5107c6a124025279996d6 (patch)
tree9744ed6a454e8d5ba69657e4ad5fdd699b726b25 /app/models
parentf74331a8e6d5b0ae9c2c73a36ba19730752269aa (diff)
downloadgovuk-mini-environment-admin-93c1c6e5b76ed712f6c5107c6a124025279996d6.tar
govuk-mini-environment-admin-93c1c6e5b76ed712f6c5107c6a124025279996d6.tar.gz
Change how the EFS File System is handled
For the AWS backend. Bring it in to the Terraform configuration for the backend, where previously only the id was known. Also, alter the provisioning so that it can handle an empty EFS file system. This reduces the amount of manual setup required for AWS.
Diffstat (limited to 'app/models')
-rw-r--r--app/models/backends/terraform_aws.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/models/backends/terraform_aws.rb b/app/models/backends/terraform_aws.rb
index e448cd8..d5abfee 100644
--- a/app/models/backends/terraform_aws.rb
+++ b/app/models/backends/terraform_aws.rb
@@ -31,7 +31,6 @@
# updated_at :datetime not null
# domain :string
# route_53_zone_id :string not null
-# efs_file_system_id :string not null
# vpc_id :string not null
#
@@ -107,6 +106,7 @@ class Backends::TerraformAws < ApplicationRecord
vars: common_terraform_variables.merge(
aws_vpc_id: vpc_id,
ssh_public_key: ssh_public_key,
+ backend_slug: label.parameterize,
mini_environment_admin_guix_public_key: guix_public_key,
mini_environment_admin_public_ip_address: public_ip_address
),
@@ -132,8 +132,7 @@ class Backends::TerraformAws < ApplicationRecord
aws_secret_key: aws_secret_access_key,
aws_region: aws_region,
ssh_public_key: ssh_public_key,
- aws_route_53_zone_id: route_53_zone_id,
- aws_efs_file_system_id: efs_file_system_id
+ aws_route_53_zone_id: route_53_zone_id
}
end