Skip to content

Commit 55b421f

Browse files
committed
terraform/AWS: Use "output yaml" for the region setting
Refactor: Remove the line in terraform.Makefile that sets "terraform_aws_region", and just pass it directly from Kconfig via an "output yaml" directive. Signed-off-by: Chuck Lever <[email protected]>
1 parent 99af1eb commit 55b421f

File tree

2 files changed

+1
-1
lines changed

2 files changed

+1
-1
lines changed

scripts/terraform.Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ KDEVOPS_MRPROPER += $(KDEVOPS_NODES)
4848
DEFAULT_DEPS_REQS_EXTRA_VARS += $(KDEVOPS_TFVARS)
4949

5050
ifeq (y,$(CONFIG_TERRAFORM_AWS))
51-
TERRAFORM_EXTRA_VARS += terraform_aws_region=$(subst ",,$(CONFIG_TERRAFORM_AWS_REGION))
5251
TERRAFORM_EXTRA_VARS += terraform_aws_av_region=$(subst ",,$(CONFIG_TERRAFORM_AWS_AV_REGION))
5352
TERRAFORM_EXTRA_VARS += terraform_aws_ami_owner=$(subst ",,$(CONFIG_TERRAFORM_AWS_AMI_OWNER))
5453
TERRAFORM_EXTRA_VARS += terraform_aws_ns='$(CONFIG_TERRAFORM_AWS_NS)'

terraform/aws/kconfigs/Kconfig.location

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ endchoice
7272

7373
config TERRAFORM_AWS_REGION
7474
string
75+
output yaml
7576
default "us-west-2" if TERRAFORM_AWS_US_WEST_2
7677
default "us-west-1" if TERRAFORM_AWS_US_WEST_1
7778
default "us-east-2" if TERRAFORM_AWS_US_EAST_2

0 commit comments

Comments
 (0)