[RFC,01/31] terraform/OCI: Remove terraform_oci_instance_display_name

Commit Message

Chuck Lever April 1, 2025, 12:59 a.m. UTC

From: Chuck Lever <[e-mail]>

This variable is neither set via Kconfig nor referenced in
terraform/oci/main.tf.

Signed-off-by: Chuck Lever <[e-mail]>
---
 playbooks/roles/gen_tfvars/defaults/main.yml                 | 1 -
 playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2 | 1 -
 terraform/oci/vars.tf                                        | 5 -----
 3 files changed, 7 deletions(-)

Patch

diff --git a/playbooks/roles/gen_tfvars/defaults/main.yml b/playbooks/roles/gen_tfvars/defaults/main.yml
index fa317939d82d..e892d85572a8 100644
--- a/playbooks/roles/gen_tfvars/defaults/main.yml
+++ b/playbooks/roles/gen_tfvars/defaults/main.yml
@@ -60,7 +60,6 @@  terraform_oci_instance_flex_ocpus: "invalid"
 terraform_oci_instance_flex_memory_in_gbs: "invalid"
 terraform_oci_os_image_ocid: "invalid"
 terraform_oci_assign_public_ip: "invalid"
-terraform_oci_instance_display_name: "invalid"
 terraform_oci_subnet_ocid: "invalid"
 terraform_oci_data_volume_display_name: "invalid"
 terraform_oci_data_volume_device_file_name: "invalid"
diff --git a/playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2 b/playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2
index 2d45fd77d510..f7b9ffb48c64 100644
--- a/playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2
+++ b/playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2
@@ -10,7 +10,6 @@  oci_instance_flex_ocpus = {{ terraform_oci_instance_flex_ocpus }}
 oci_instance_flex_memory_in_gbs = {{ terraform_oci_instance_flex_memory_in_gbs }}
 oci_os_image_ocid = "{{ terraform_oci_os_image_ocid }}"
 oci_assign_public_ip = "{{ terraform_oci_assign_public_ip | lower }}"
-oci_instance_display_name = "{{ terraform_oci_instance_display_name }}"
 oci_subnet_ocid = "{{ terraform_oci_subnet_ocid }}"
 oci_volumes_enable_extra = "{{ terraform_oci_volumes_enable_extra | lower }}"
 {% if terraform_oci_volumes_enable_extra %}
diff --git a/terraform/oci/vars.tf b/terraform/oci/vars.tf
index 077a9a4afdaa..f43e1ee281fc 100644
--- a/terraform/oci/vars.tf
+++ b/terraform/oci/vars.tf
@@ -55,11 +55,6 @@  variable "oci_os_image_ocid" {
   default = ""
 }
 
-variable "oci_instance_display_name" {
-  description = "Name of the instance"
-  default = ""
-}
-
 variable "oci_assign_public_ip" {
   description = "Assign public IP to the instance"
   default = false