-
Notifications
You must be signed in to change notification settings - Fork 25
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Upgrade tf code to 0.12 * Fix tf interpolation * Fix type * Use null for spot_price by default * Set some more nulls as defaults * Bump default tf version in the ci task
- Loading branch information
1 parent
ae09461
commit f97842f
Showing
13 changed files
with
285 additions
and
187 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,55 +1,55 @@ | ||
| module "blue" { | ||
| source = "../single-stack" | ||
| color = "blue" | ||
| name = "${var.name}" | ||
| max_size = "${var.blue_max_size}" | ||
| min_size = "${var.blue_min_size}" | ||
| desired_capacity = "${var.blue_desired_capacity}" | ||
| ami = "${var.blue_ami}" | ||
| user_data = "${var.blue_user_data}" | ||
| instance_type = "${var.blue_instance_type}" | ||
| disk_volume_size = "${var.blue_disk_volume_size}" | ||
| disk_volume_type = "${var.blue_disk_volume_type}" | ||
| spot_price = "${var.spot_price}" | ||
| loadbalancers = ["${var.loadbalancers}"] | ||
| key_name = "${var.key_name}" | ||
| security_groups = ["${var.security_groups}"] | ||
| iam_instance_profile = "${var.iam_instance_profile}" | ||
| associate_public_ip_address = "${var.associate_public_ip_address}" | ||
| subnets = "${var.subnets}" | ||
| health_check_grace_period = "${var.health_check_grace_period}" | ||
| termination_policies = ["${var.termination_policies}"] | ||
| target_group_arns = ["${var.target_group_arns}"] | ||
| health_check_type = "${var.health_check_type}" | ||
| wait_for_capacity_timeout = "${var.wait_for_capacity_timeout}" | ||
| tags = "${var.tags}" | ||
| initial_lifecycle_hooks = ["${var.initial_lifecycle_hooks}"] | ||
| name = var.name | ||
| max_size = var.blue_max_size | ||
| min_size = var.blue_min_size | ||
| desired_capacity = var.blue_desired_capacity | ||
| ami = var.blue_ami | ||
| user_data = var.blue_user_data | ||
| instance_type = var.blue_instance_type | ||
| disk_volume_size = var.blue_disk_volume_size | ||
| disk_volume_type = var.blue_disk_volume_type | ||
| spot_price = var.spot_price | ||
| loadbalancers = var.loadbalancers | ||
| key_name = var.key_name | ||
| security_groups = var.security_groups | ||
| iam_instance_profile = var.iam_instance_profile | ||
| associate_public_ip_address = var.associate_public_ip_address | ||
| subnets = var.subnets | ||
| health_check_grace_period = var.health_check_grace_period | ||
| termination_policies = var.termination_policies | ||
| target_group_arns = var.target_group_arns | ||
| health_check_type = var.health_check_type | ||
| wait_for_capacity_timeout = var.wait_for_capacity_timeout | ||
| tags = var.tags | ||
| initial_lifecycle_hooks = var.initial_lifecycle_hooks | ||
| } | ||
|
|
||
| module "green" { | ||
| source = "../single-stack" | ||
| color = "green" | ||
| name = "${var.name}" | ||
| max_size = "${var.green_max_size}" | ||
| min_size = "${var.green_min_size}" | ||
| desired_capacity = "${var.green_desired_capacity}" | ||
| ami = "${var.green_ami}" | ||
| user_data = "${var.green_user_data}" | ||
| instance_type = "${var.green_instance_type}" | ||
| disk_volume_size = "${var.green_disk_volume_size}" | ||
| disk_volume_type = "${var.green_disk_volume_type}" | ||
| spot_price = "${var.spot_price}" | ||
| loadbalancers = ["${var.loadbalancers}"] | ||
| key_name = "${var.key_name}" | ||
| security_groups = ["${var.security_groups}"] | ||
| iam_instance_profile = "${var.iam_instance_profile}" | ||
| associate_public_ip_address = "${var.associate_public_ip_address}" | ||
| subnets = "${var.subnets}" | ||
| health_check_grace_period = "${var.health_check_grace_period}" | ||
| termination_policies = ["${var.termination_policies}"] | ||
| target_group_arns = ["${var.target_group_arns}"] | ||
| health_check_type = "${var.health_check_type}" | ||
| wait_for_capacity_timeout = "${var.wait_for_capacity_timeout}" | ||
| tags = "${var.tags}" | ||
| initial_lifecycle_hooks = ["${var.initial_lifecycle_hooks}"] | ||
| name = var.name | ||
| max_size = var.green_max_size | ||
| min_size = var.green_min_size | ||
| desired_capacity = var.green_desired_capacity | ||
| ami = var.green_ami | ||
| user_data = var.green_user_data | ||
| instance_type = var.green_instance_type | ||
| disk_volume_size = var.green_disk_volume_size | ||
| disk_volume_type = var.green_disk_volume_type | ||
| spot_price = var.spot_price | ||
| loadbalancers = var.loadbalancers | ||
| key_name = var.key_name | ||
| security_groups = var.security_groups | ||
| iam_instance_profile = var.iam_instance_profile | ||
| associate_public_ip_address = var.associate_public_ip_address | ||
| subnets = var.subnets | ||
| health_check_grace_period = var.health_check_grace_period | ||
| termination_policies = var.termination_policies | ||
| target_group_arns = var.target_group_arns | ||
| health_check_type = var.health_check_type | ||
| wait_for_capacity_timeout = var.wait_for_capacity_timeout | ||
| tags = var.tags | ||
| initial_lifecycle_hooks = var.initial_lifecycle_hooks | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,19 @@ | ||
| output "blue_asg_id" { | ||
| description = "Blue autoscaling group id" | ||
| value = "${module.blue.asg_id}" | ||
| value = module.blue.asg_id | ||
| } | ||
|
|
||
| output "green_asg_id" { | ||
| description = "Green autoscaling group id" | ||
| value = "${module.green.asg_id}" | ||
| value = module.green.asg_id | ||
| } | ||
|
|
||
| output "nonbinding_blue_asg_name" { | ||
| description = "This is the raw blue autoscaling group name, without creating a dependency with the actual autoscaling group resource" | ||
| value = "${module.blue.nonbinding_asg_name}" | ||
| value = module.blue.nonbinding_asg_name | ||
| } | ||
|
|
||
| output "nonbinding_green_asg_name" { | ||
| description = "This is the raw green autoscaling group name, without creating a dependency with the actual autoscaling group resource" | ||
| value = "${module.green.nonbinding_asg_name}" | ||
| value = module.green.nonbinding_asg_name | ||
| } |
Oops, something went wrong.