From patchwork Tue Apr 1 00:59:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034254 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9D86E2AEFB for ; Tue, 1 Apr 2025 01:00:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469210; cv=none; b=ddZsLb3UV2gq5n18f9SdKepduUxySWWhpN+E/8wfGM9pivQwJ2tZcg1E1YFBsJSgsQIIjj2tTxx8PimekH1dNxoN3tJN36X+JKtMei6yqyIVTdQAc0503yHMb/etQ4S6KPv4W1NHcfkiqWJ5m71LgWS3aTWTTuLSE1wkJBvOGxc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469210; c=relaxed/simple; bh=pIG0kJljltUrScgYpVUNez4+q/VxvpY7kE1Y+XSMVIc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fTeriBQTZD+pqd5uRkb8gIp6IN/O4vrAZfcS/jrGbZAgfXpRfHe3B/vg61yd+wq5D6YzY5JWz0JxXIkcXTSOu33rxsWIVvqo+KdRkKybuZ97n36TS5jAm8i+ZkKsdl5DA8IXl/NW7c1T8FaqYI8fQbUpEkLjpiMr5KY+7EOW2os= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YbOpr7Ne; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="YbOpr7Ne" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B4F16C4CEE5; Tue, 1 Apr 2025 01:00:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469208; bh=pIG0kJljltUrScgYpVUNez4+q/VxvpY7kE1Y+XSMVIc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YbOpr7NeS9DBniCorsE+MMWkqUC6LXpRrvAunSRhZHSTQB9tzZ4ljpDzVWhV34Bij jNPah6ls9U7n0W6iHZooPlDg9LlPechdDlvxgKi0SesrlWLXmFrMCMgaswsiqvp7Uf crvtIRWMUPjSABq4XQAbFy4M0jvqc9+qzenR6ofj9dPmAnaUWoFZK/WODdJ7D2QSgh GHRUE6N+EjzWsGk66PwM4IXUC6dpJbtJyk6h9RZTPsB0HL06J+kAreZf0QgTL0gCOC Xf8WT7UsdNUCjQM0sthGPKw9wNI7bf+PbLpU8LGdblqzROC3gLOOfJIws2dOyC27sj bEwyVpJXl4RMw== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 01/31] terraform/OCI: Remove terraform_oci_instance_display_name Date: Mon, 31 Mar 2025 20:59:30 -0400 Message-ID: <20250401010000.764234-2-cel@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250401010000.764234-1-cel@kernel.org> References: <20250401010000.764234-1-cel@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Chuck Lever This variable is neither set via Kconfig nor referenced in terraform/oci/main.tf. Signed-off-by: Chuck Lever --- 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(-) 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