Skip to content

Commit

Permalink
Merge pull request #67 from rackspace-infrastructure-automation/provi…
Browse files Browse the repository at this point in the history 
…der_bug

terraform provider issue
  • Loading branch information
@twistedgrim
twistedgrim committed Jun 5, 2020
2 parents eced8ee + 1105a90 commit 475be92
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 32 deletions.
50 changes: 23 additions & 27 deletions main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -720,21 +720,19 @@ module "cpu_alarm_high" {
resource "aws_instance" "mod_ec2_instance_no_secondary_ebs" {
count = var.secondary_ebs_volume_size != "" ? 0 : var.instance_count

ami = var.image_id != "" ? var.image_id : data.aws_ami.ar_ami.image_id
subnet_id = element(var.subnets, count.index)
vpc_security_group_ids = var.security_groups
instance_type = var.instance_type
key_name = var.key_pair
ebs_optimized = var.enable_ebs_optimization
tags = merge(var.tags, local.tags, local.tags_ec2, { Name = "${var.name}${var.instance_count > 1 ? format("-%03d", count.index + 1) : ""}" })
tenancy = var.tenancy
monitoring = var.detailed_monitoring
user_data_base64 = base64encode(data.template_file.user_data.rendered)

# coalescelist and list("") were used here due to element not being able to handle empty lists, even if conditional will not allow portion to execute
private_ip = element(coalescelist(var.private_ip_address, [""]), count.index)
ami = var.image_id != "" ? var.image_id : data.aws_ami.ar_ami.image_id
disable_api_termination = var.disable_api_termination
ebs_optimized = var.enable_ebs_optimization
instance_type = var.instance_type
key_name = var.key_pair
monitoring = var.detailed_monitoring
private_ip = length(var.private_ip_address) > 0 ? element(var.private_ip_address, count.index) : null
subnet_id = element(var.subnets, count.index)
tags = merge(var.tags, local.tags, local.tags_ec2, { Name = "${var.name}${var.instance_count > 1 ? format("-%03d", count.index + 1) : ""}" })
tenancy = var.tenancy
user_data_base64 = base64encode(data.template_file.user_data.rendered)
volume_tags = var.ebs_volume_tags
vpc_security_group_ids = var.security_groups

credit_specification {
cpu_credits = var.t2_unlimited_mode
Expand Down Expand Up @@ -762,21 +760,19 @@ resource "aws_instance" "mod_ec2_instance_no_secondary_ebs" {
resource "aws_instance" "mod_ec2_instance_with_secondary_ebs" {
count = var.secondary_ebs_volume_size != "" ? var.instance_count : 0

ami = var.image_id != "" ? var.image_id : data.aws_ami.ar_ami.image_id
subnet_id = element(var.subnets, count.index)
vpc_security_group_ids = var.security_groups
instance_type = var.instance_type
key_name = var.key_pair
ebs_optimized = var.enable_ebs_optimization
tags = merge(var.tags, local.tags, local.tags_ec2, { Name = "${var.name}${var.instance_count > 1 ? format("-%03d", count.index + 1) : ""}" })
tenancy = var.tenancy
monitoring = var.detailed_monitoring
volume_tags = var.ebs_volume_tags
user_data_base64 = base64encode(data.template_file.user_data.rendered)

# coalescelist and list("") were used here due to element not being able to handle empty lists, even if conditional will not allow portion to execute
private_ip = element(coalescelist(var.private_ip_address, [""]), count.index)
ami = var.image_id != "" ? var.image_id : data.aws_ami.ar_ami.image_id
disable_api_termination = var.disable_api_termination
ebs_optimized = var.enable_ebs_optimization
instance_type = var.instance_type
key_name = var.key_pair
monitoring = var.detailed_monitoring
private_ip = length(var.private_ip_address) > 0 ? element(var.private_ip_address, count.index) : null
subnet_id = element(var.subnets, count.index)
tags = merge(var.tags, local.tags, local.tags_ec2, { Name = "${var.name}${var.instance_count > 1 ? format("-%03d", count.index + 1) : ""}" })
tenancy = var.tenancy
user_data_base64 = base64encode(data.template_file.user_data.rendered)
volume_tags = var.ebs_volume_tags
vpc_security_group_ids = var.security_groups

credit_specification {
cpu_credits = var.t2_unlimited_mode
Expand Down
7 changes: 2 additions & 5 deletions tests/test1/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,6 @@ module "ec2_ar_centos7_no_codedeploy" {
secondary_ebs_volume_type = "gp2"
encrypt_secondary_ebs_volume = false



environment = "Development"
instance_role_managed_policy_arns = ["arn:aws:iam::aws:policy/AmazonEC2FullAccess", "arn:aws:iam::aws:policy/service-role/AmazonEC2SpotFleetRole", "arn:aws:iam::aws:policy/CloudWatchActionsEC2Access"]
perform_ssm_inventory_tag = true
Expand Down Expand Up @@ -145,7 +143,7 @@ module "ec2_ar_centos7_no_scaleft" {

ec2_os = "centos7"
instance_count = 1
subnets = module.vpc.private_subnets
subnets = [element(module.vpc.private_subnets, 0)]
security_groups = [module.vpc.default_sg]
key_pair = "CircleCI"
instance_type = "t2.micro"
Expand All @@ -157,6 +155,7 @@ module "ec2_ar_centos7_no_scaleft" {
backup_tag_value = "False"
detailed_monitoring = true
ssm_patching_group = "Group1Patching"
private_ip_address = ["172.18.16.142"]
primary_ebs_volume_size = 60
primary_ebs_volume_iops = 0
primary_ebs_volume_type = "gp2"
Expand Down Expand Up @@ -409,5 +408,3 @@ module "ar_r53" {
rackspace_managed = false

}


0 comments on commit 475be92

Please sign in to comment.