trinitor/DetectionLab
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #308 from strcrzy/aws_local_amis

Browse Source 
local AMI vars should override data sources
This commit is contained in:
Chris Long
2019-07-10 12:32:46 -07:00
committed by GitHub
parent 280bce8252 68846d1d98
commit 0a7f7a16e8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Terraform/main.tf
View File

@@ -142,7 +142,7 @@ resource "aws_key_pair" "auth" {
resource "aws_instance" "logger" { resource "aws_instance" "logger" {
instance_type = "t2.medium" instance_type = "t2.medium"
ami = coalesce(data.aws_ami.logger_ami.image_id, var.logger_ami) ami = coalesce(var.logger_ami, data.aws_ami.logger_ami.image_id)
tags = { tags = {
Name = "logger" Name = "logger"
@@ -190,7 +190,7 @@ resource "aws_instance" "dc" {
instance_type = "t2.medium" instance_type = "t2.medium"
# Uses the local variable if external data source resolution fails # Uses the local variable if external data source resolution fails
ami = coalesce(data.aws_ami.dc_ami.image_id, var.dc_ami) ami = coalesce(var.dc_ami, data.aws_ami.dc_ami.image_id)
tags = { tags = {
Name = "dc.windomain.local" Name = "dc.windomain.local"
@@ -209,7 +209,7 @@ resource "aws_instance" "wef" {
instance_type = "t2.medium" instance_type = "t2.medium"
# Uses the local variable if external data source resolution fails # Uses the local variable if external data source resolution fails
ami = coalesce(data.aws_ami.wef_ami.image_id, var.wef_ami) ami = coalesce(var.wef_ami, data.aws_ami.wef_ami.image_id)
tags = { tags = {
Name = "wef.windomain.local" Name = "wef.windomain.local"
@@ -228,7 +228,7 @@ resource "aws_instance" "win10" {
instance_type = "t2.medium" instance_type = "t2.medium"
# Uses the local variable if external data source resolution fails # Uses the local variable if external data source resolution fails
ami = coalesce(data.aws_ami.win10_ami.image_id, var.win10_ami) ami = coalesce(var.win10_ami, data.aws_ami.win10_ami.image_id)
tags = { tags = {
Name = "win10.windomain.local" Name = "win10.windomain.local"