Use 'env_vars' instead of 'config_vars'

wellcometrust · Dec 13, 2017 · 0edf088 · 0edf088
1 parent 6e74693
commit 0edf088
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/service/README.md b/service/README.md
@@ -14,10 +14,7 @@ module "my_service" {
   cluster_id = "${var.cluster_id}"
   vpc_id     = "${var.vpc_id}"
 
-  infra_bucket = "${var.infra_bucket}"
-  config_key   = "${var.config_key}"
-
-  config_vars = {
+  env_vars = {
     IP_ADDRESS = "192.0.2.6"
     HOST       = "localhost"
     ...

diff --git a/service/main.tf b/service/main.tf
@@ -53,7 +53,7 @@ module "task" {
     NGINX_PORT   = "${var.primary_container_port}"
   }
 
-  config_vars = "${var.config_vars}"
+  config_vars = "${var.env_vars}"
 
   log_group_name_prefix = "${var.log_group_name_prefix}"
 }
diff --git a/service/variables.tf b/service/variables.tf
@@ -82,7 +82,7 @@ variable "container_path" {
   default     = "/tmp"
 }
 
-variable "config_vars" {
+variable "env_vars" {
   description = "Environment variables to pass to the container"
   type        = "map"
   default     = {}

diff --git a/sqs_autoscaling_service/main.tf b/sqs_autoscaling_service/main.tf
@@ -41,7 +41,7 @@ module "service" {
   deployment_minimum_healthy_percent = "0"
   deployment_maximum_percent         = "200"
 
-  config_vars = "${var.config_vars}"
+  env_vars = "${var.env_vars}"
 
   loadbalancer_cloudwatch_id   = "${var.alb_cloudwatch_id}"
   server_error_alarm_topic_arn = "${var.alb_server_error_alarm_arn}"

diff --git a/sqs_autoscaling_service/variables.tf b/sqs_autoscaling_service/variables.tf
@@ -14,7 +14,7 @@ variable "memory" {
   default = 1024
 }
 
-variable "config_vars" {
+variable "env_vars" {
   description = "Environment variables to pass to the container"
   type        = "map"
 }