Skip to content

Commit 4baf73f

Browse files
committed
terraform/Azure: Use "output yaml" for the EBS volume type setting
Remove the line in terraform.Makefile that sets "terraform_ebs_volume_type" and just pass it directly from Kconfig via an "output yaml" directive. Signed-off-by: Chuck Lever <[email protected]>
1 parent 0dc217e commit 4baf73f

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
@@ -51,7 +51,6 @@ ifeq (y,$(CONFIG_TERRAFORM_AWS))
5151
ifeq (y,$(CONFIG_TERRAFORM_AWS_ENABLE_EBS_VOLUMES))
5252
TERRAFORM_EXTRA_VARS += terraform_aws_enable_ebs='True'
5353
TERRAFORM_EXTRA_VARS += terraform_aws_ebs_volume_size=$(subst ",,$(CONFIG_TERRAFORM_TERRAFORM_AWS_EBS_VOLUME_SIZE))
54-
TERRAFORM_EXTRA_VARS += terraform_aws_ebs_volume_type=$(subst ",,$(CONFIG_TERRAFORM_AWS_EBS_VOLUME_TYPE))
5554
ifeq (y,$(CONFIG_TERRAFORM_AWS_EBS_VOLUME_NEEDS_IOPS))
5655
TERRAFORM_EXTRA_VARS += terraform_aws_ebs_volume_needs_iops=true
5756
TERRAFORM_EXTRA_VARS += terraform_aws_ebs_volume_iops=$(subst ",,$(CONFIG_TERRAFORM_AWS_EBS_VOLUME_IOPS))

terraform/aws/kconfigs/Kconfig.storage

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

9191
config TERRAFORM_AWS_EBS_VOLUME_TYPE
9292
string
93+
output yaml
9394
default "gp2" if TERRAFORM_AWS_EBS_VOLUME_TYPE_GP2
9495
default "gp3" if TERRAFORM_AWS_EBS_VOLUME_TYPE_GP3
9596
default "io1" if TERRAFORM_AWS_EBS_VOLUME_TYPE_IO1

0 commit comments

Comments
 (0)