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 From patchwork Tue Apr 1 00:59:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034250 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 CBDCD2E3371 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=1743469208; cv=none; b=cq65sToOHgRjRwtELE945n1SlqDfxs0qUO+zo73r2+Uq+0WHr7oOLzzSqGKLNqTzUOj0ww/GeaJJnQUnxqD3Yiu3q/5/vgsNpKBCnFlD6o9McIMT6PK+zC921bk90oSmLYG4Jy7+DDIuLpUcBBf7SOspGmikRtSgOKMgAw/UboE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469208; c=relaxed/simple; bh=gCu7bJgsAyzUmGr6ttwRlfVoVNg+QCXrqXbPZv23tAE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eTrwJ2EghdZHVR/cQ9cdhr6hU5+dWp6pcQAoL3az2cQaIE/CvOfukPYhMs1i/m7xseHv2oxHd5cDSvez2Odcgpj628MBVgzt62nPEhqWyAHu67EHCFA7Tf9GIlFvObEyhpFzEYAuCCPimpvyyW8vcmovzsk60IQetCRw0G3eTC0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DJ9l6aqs; 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="DJ9l6aqs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5214CC4CEE3; Tue, 1 Apr 2025 01:00:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469208; bh=gCu7bJgsAyzUmGr6ttwRlfVoVNg+QCXrqXbPZv23tAE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DJ9l6aqsIcjHtz1R/zwpeJMhO2iHJZqlUyXJ2sm/8PrYUtRvTgZEJ0GJhVQSwYtcq EAhHid2JHeNWRTQumuhjFFcF3wgPEjdU8nRJadl3gSbSHnJTG5BnGwTB/kTwSD0gIx qHJWJ3yILr/6EZtSeLOJaDeownjrO0NvrarVGd1O7trdcEWDiKAv3ZrG+EHFD2YHLx QeSsWWQPQx8aGiVc6KHJIa83CY6NqD1JEM8wED/uwjHQo0RthyXjjldXJbDRlKbDsT hG5PFCO0FtOfea6CUTokRnzdqUYiuX51GiXVxTnCVQ/kNihAHMnfSBerrIL7Dilc9n RwgUud+Nvnl2Q== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 02/31] terraform/OCI: One default value to rule them Date: Mon, 31 Mar 2025 20:59:31 -0400 Message-ID: <20250401010000.764234-3-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 There are 3 sets of default values for each terraform setting. 1. The default value set in terraform/oci/Kconfig 2. The default value in playbooks/roles/gen_tfvars/defaults/main.yml 3. The default value specified in terraform/oci/vars.tf Often these defaults are different values. It's confusing for developers, but worse is that it can result in hard-to-diagnose terraform provider error messages (eg, "Where did that 'invalid' come from?"). IMO a better plan is to let Kconfig provide the only default value, and remove the other two. We then have a single authoritative default value for each setting. If a required variable is missing a value during "terraform plan", that will always be a local bug, not something exposed to the provider to report via an obscure error message. There are two exceptions: - For Kconfig booleans, often the variable is defined with a "y" value in the "true" case, but not defined at all in the "false" case. So for booleans, the gen_tfvars template needs a default value in gen_tfvars/defaults/main.yml of "false". - Where a terraform resource expects an argument to be not present in some configurations, then vars.tf needs to explicitly define a default value of "null". Only in those cases it is OK for no value to be provided by Kconfig. This is a refactoring change; no behavior change is intended. Signed-off-by: Chuck Lever --- playbooks/roles/gen_tfvars/defaults/main.yml | 18 +-------- terraform/oci/vars.tf | 42 ++++++++++---------- 2 files changed, 21 insertions(+), 39 deletions(-) diff --git a/playbooks/roles/gen_tfvars/defaults/main.yml b/playbooks/roles/gen_tfvars/defaults/main.yml index e892d85572a8..f64102b2fbf5 100644 --- a/playbooks/roles/gen_tfvars/defaults/main.yml +++ b/playbooks/roles/gen_tfvars/defaults/main.yml @@ -48,23 +48,7 @@ terraform_gce_scatch_disk_type: "invalid" terraform_gce_image_name: "invalid" terraform_gce_credentials: "invalid" -terraform_oci_region: "invalid" -terraform_oci_tenancy_ocid: "invalid" -terraform_oci_user_ocid: "invalid" -terraform_oci_user_private_key_path: "invalid" -terraform_oci_user_fingerprint: "invalid" -terraform_oci_availablity_domain_ocid: "invalid" -terraform_oci_compartment_ocid: "invalid" -terraform_oci_shape: "invalid" -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_subnet_ocid: "invalid" -terraform_oci_data_volume_display_name: "invalid" -terraform_oci_data_volume_device_file_name: "invalid" -terraform_oci_sparse_volume_display_name: "invalid" -terraform_oci_sparse_volume_device_file_name: "invalid" +terraform_oci_assign_public_ip: "false" terraform_openstack_cloud_name: "invalid" terraform_openstack_instance_prefix: "invalid" diff --git a/terraform/oci/vars.tf b/terraform/oci/vars.tf index f43e1ee281fc..4c6383d9b231 100644 --- a/terraform/oci/vars.tf +++ b/terraform/oci/vars.tf @@ -1,103 +1,101 @@ variable "oci_region" { description = "An OCI region" - default = "" + type = string } variable "oci_tenancy_ocid" { description = "OCID of your tenancy" - default = "" + type = string } variable "oci_user_ocid" { description = "OCID of the user calling the API" - default = "" + type = string } variable "oci_user_private_key_path" { description = "The path of the private key stored on your computer" - default = "" + type = string } variable "oci_user_fingerprint" { description = "Fingerprint for the key pair being used" - default = "" + type = string } variable "oci_availablity_domain" { description = "Name of availability domain" - default = "" + type = string } variable "oci_compartment_ocid" { description = "OCID of compartment" - default = "" + type = string } variable "oci_shape" { description = "Shape name" - default = "" + type = string } variable "oci_instance_flex_ocpus" { + default = null description = "The total number of OCPUs available to the instance." - type = number - default = null + type = number } variable "oci_instance_flex_memory_in_gbs" { + default = null description = "The total amount of memory available to the instance, in gigabytes." - type = number - default = null + type = number } variable "oci_os_image_ocid" { description = "OCID of OS image" - default = "" + type = string } variable "oci_assign_public_ip" { description = "Assign public IP to the instance" - default = false + type = bool } variable "oci_subnet_ocid" { description = "Subnet OCID" - default = "" + type = string } variable "oci_volumes_enable_extra" { description = "Create additional block volumes per instance" - default = false + type = bool } variable "oci_volumes_per_instance" { description = "The count of additional block volumes per instance" type = number - default = 0 } variable "oci_volumes_size" { description = "The size of additional block volumes, in gibibytes" type = number - default = 0 } variable "oci_data_volume_display_name" { description = "Display name to use for the data volume" - default = "data" + type = string } variable oci_data_volume_device_file_name { description = "Data volume's device file name" - default = "/dev/oracleoci/oraclevdb" + type = string } variable "oci_sparse_volume_display_name" { description = "Display name to use for the sparse volume" - default = "sparse" + type = string } variable oci_sparse_volume_device_file_name { description = "Sparse volume's device file name" - default = "/dev/oracleoci/oraclevdc" + type = string } From patchwork Tue Apr 1 00:59:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034251 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 629702E3371 for ; Tue, 1 Apr 2025 01:00:09 +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=1743469209; cv=none; b=beJr3kkYH0B/Oszxkgh+8A19Ml1XXUb24RyUFGcmwHwyqAlhrRKqk1uJmJBK4FjWAQpOCjqZQIxuDmNg+x14j/oFPavZ7ZPsMtm7YxbDwE1c2WieY0C+ly7MrI+Hjnm/05PWZRXspD2XS0cnLBgJn8DIoZssuff/N5wfu/lyw64= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469209; c=relaxed/simple; bh=XrmJ2tUhXn98wNZfahdSywCcoPgi0gt2EQVtq8vNgHo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DwxiVRIS1OxRgj/ZkYEUgsqbTBcK09bogejvXb8yBHsJEFU5zrgUWUuPfHgmSNQWYTMGiT7abUMSj5rGkWESPfismikcdpkW9fSQnwUJog554b+boz+lLKBPFhbzsms9pz5ebTGrvErQqu9PJlyJfj9x+TAdm0HH1UX105lecL0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=X4CrYjA0; 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="X4CrYjA0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E3982C4CEEB; Tue, 1 Apr 2025 01:00:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469209; bh=XrmJ2tUhXn98wNZfahdSywCcoPgi0gt2EQVtq8vNgHo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X4CrYjA0ZkGvfMC8xNAzMXQU1RsN8CXgfLE3JbiBwQeOnrBbfdP5i6w9iTbufKc0F LQO0EW/d7mqBmgnfYUKz96g7kdQiNZ9JIB/OBj9yXjrfnC4DXHFACWVHf1cq1XwPUx DmqBAXtd1pI7ZbMzFycJXb6hssysYEJdt3VjL1qzriS/jOUMYf5ZjxlW7qVCP6QONA oyC2fh/YmVw10YMOaABX5BMhw+3FID54Gzi6wejq7Q2F4LDyohjExAjIuo+0J+O7d1 SdcG4UqkSuj7bjgiTI52x93en8R2+SD3NCkZr/QhTtTrwHgcvNF1zr35Waw6sVAdgf 7tGugffHIMxOA== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 03/31] terraform/OCI: Add an "Identity & Access" submenu Date: Mon, 31 Mar 2025 20:59:32 -0400 Message-ID: <20250401010000.764234-4-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 To follow the same topic organization as the web cloud console, move the identity and access selectors into a submenu. Signed-off-by: Chuck Lever --- terraform/oci/Kconfig | 32 ++++--------------------- terraform/oci/kconfigs/Kconfig.identity | 27 +++++++++++++++++++++ 2 files changed, 31 insertions(+), 28 deletions(-) create mode 100644 terraform/oci/kconfigs/Kconfig.identity diff --git a/terraform/oci/Kconfig b/terraform/oci/Kconfig index 00f03163ed83..446a49e76b57 100644 --- a/terraform/oci/Kconfig +++ b/terraform/oci/Kconfig @@ -1,5 +1,9 @@ if TERRAFORM_OCI +menu "Identity & Access" +source "terraform/oci/kconfigs/Kconfig.identity" +endmenu + config TERRAFORM_OCI_REGION string "OCI Region" help @@ -7,34 +11,6 @@ config TERRAFORM_OCI_REGION Read this: https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm -config TERRAFORM_OCI_TENANCY_OCID - string "OCI tenant OCID" - help - The OCI ID of the tenancy to use. - Read this: - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm - -config TERRAFORM_OCI_USER_OCID - string "OCI user OCID" - help - The OCI ID of the user to use. - Read this: - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm - -config TERRAFORM_OCI_USER_PRIVATE_KEY_PATH - string "OCI user private key path" - help - Path to the file containing the private key of the user. - Read this: - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm - -config TERRAFORM_OCI_USER_FINGERPRINT - string "OCI user fingerprint" - help - Fingerprint for the key pair being used. - Read this: - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm - config TERRAFORM_OCI_AVAILABLITY_DOMAIN string "OCI availablity domain" help diff --git a/terraform/oci/kconfigs/Kconfig.identity b/terraform/oci/kconfigs/Kconfig.identity new file mode 100644 index 000000000000..928c700d9bd4 --- /dev/null +++ b/terraform/oci/kconfigs/Kconfig.identity @@ -0,0 +1,27 @@ +config TERRAFORM_OCI_TENANCY_OCID + string "OCI tenant OCID" + help + The OCI ID of the tenancy to use. + Read this: + https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm + +config TERRAFORM_OCI_USER_OCID + string "OCI user OCID" + help + The OCI ID of the user to use. + Read this: + https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm + +config TERRAFORM_OCI_USER_PRIVATE_KEY_PATH + string "OCI user private key path" + help + Path to the file containing the private key of the user. + Read this: + https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm + +config TERRAFORM_OCI_USER_FINGERPRINT + string "OCI user fingerprint" + help + Fingerprint for the key pair being used. + Read this: + https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm From patchwork Tue Apr 1 00:59:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034252 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 018A22E3371 for ; Tue, 1 Apr 2025 01:00:09 +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=Qejo7XVd1x82XseB+DiJ5+d+HzHBYCaBxdfZVanLJgb2yIqJR0R7RRjE0N99DdgddwiTNwcdP9SnYuT4jt7F1a/+Z7/m7PIsMngABJ5TngCOyPN0I3IE39nl+HeYMPxK7x5IYWHR+6WZfoCwvvX+dVxrM2ZMHEjuIe1o2By6imI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469210; c=relaxed/simple; bh=nWSX0XX2kIgtOOLhssIvpFtOmLy02R6V8WFcOQl1GIA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OL25xsPe2toOwxo8qWVhbXTuMLEDBNYib3kl/p5X3Jfb1Oh7V6TIfi+66bjswDj3NV4a+1wSaASGFhfzTG81SEsRNXDYvYKQp2xVDUl6z6P2HQLdHL+TXXMJ6cXxIrj8bvNz+Y5X6UoGHLXDaX9+HEgfx0BOtCb7J2ANbXELLeY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=A9xb18B1; 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="A9xb18B1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7FF2AC4CEEA; Tue, 1 Apr 2025 01:00:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469209; bh=nWSX0XX2kIgtOOLhssIvpFtOmLy02R6V8WFcOQl1GIA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A9xb18B1d9ymc0KhcqZrCSZljmytlxJ8r3FOwDmk2n0RLbjh0vAuUfCIbDcIhblTx iAFbLb/ORP6Y/gW1gg8aWIdf89OjztdIraiYJWrt84YwLgXVRcPI89hvPvMPpmsGOL mA33ohXQIJTYSi5H4hwiCAROz3S9top0hwkk2e1sHMqUiSEYPVue98Mdf9ToYyO29D ZESvhF1EJzbV2vyY9udP0+XoeKfETVUZZ+xNuIK0vGiYyyglr2XnDwNV9juy2U1yeC OTXmOIOyIdNyrW1HDOpzQZ7rnnlBJZ2Fpww2kc4wY+N4XVpQBCDeCN7N7krG7rKlMq Cj6QCWHS9WAZg== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 04/31] terraform/OCI: Add a "Resource location" submenu Date: Mon, 31 Mar 2025 20:59:33 -0400 Message-ID: <20250401010000.764234-5-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 Introduce the strategy of moving these submenus to their own separate Kconfig files to eventually enable their generation by querying the provider with a script (similar to "make refs-default"). This would allow the Kconfig menu content to be adjusted based on the intersection of what is currently available on the provider platform and what is accessible to the tenant. Signed-off-by: Chuck Lever --- terraform/oci/Kconfig | 24 +++--------------------- terraform/oci/kconfigs/Kconfig.location | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 21 deletions(-) create mode 100644 terraform/oci/kconfigs/Kconfig.location diff --git a/terraform/oci/Kconfig b/terraform/oci/Kconfig index 446a49e76b57..31bd2ca617f6 100644 --- a/terraform/oci/Kconfig +++ b/terraform/oci/Kconfig @@ -1,30 +1,12 @@ if TERRAFORM_OCI +menu "Resource location" +source "terraform/oci/kconfigs/Kconfig.location" +endmenu menu "Identity & Access" source "terraform/oci/kconfigs/Kconfig.identity" endmenu -config TERRAFORM_OCI_REGION - string "OCI Region" - help - This option will set the OCI resource location. - Read this: - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm - -config TERRAFORM_OCI_AVAILABLITY_DOMAIN - string "OCI availablity domain" - help - The name of the availability domain. - Read this: - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm - -config TERRAFORM_OCI_COMPARTMENT_OCID - string "OCI compartment OCID" - help - The OCI ID of user's compartment. - Read this: - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm - config TERRAFORM_OCI_SHAPE string "OCI shape name" help diff --git a/terraform/oci/kconfigs/Kconfig.location b/terraform/oci/kconfigs/Kconfig.location new file mode 100644 index 000000000000..9e06aa9332f8 --- /dev/null +++ b/terraform/oci/kconfigs/Kconfig.location @@ -0,0 +1,20 @@ +config TERRAFORM_OCI_REGION + string "OCI Region" + help + This option will set the OCI resource location. + Read this: + https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm + +config TERRAFORM_OCI_AVAILABLITY_DOMAIN + string "OCI availablity domain" + help + The name of the availability domain. + Read this: + https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm + +config TERRAFORM_OCI_COMPARTMENT_OCID + string "OCI compartment OCID" + help + The OCI ID of user's compartment. + Read this: + https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm From patchwork Tue Apr 1 00:59:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034253 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 942A024B29 for ; Tue, 1 Apr 2025 01:00:10 +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=iYifLp5dr+5bVnPV/QCW6l7/LxclAulmF81erZSZtIh+B4JcWaPG8aI+DwHQPkTLswtKDYo8VFuI+Ei/LhhCJ0Ek2nAbTMiK0DUGYKbWjqJZqiReU1akpv/J8aZx+xi8UoBRQadSZgidQo53m+xIz1MW/IuTtyMzXmE/C0HCNco= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469210; c=relaxed/simple; bh=zBjSmBMX4dZbJFY4rTji9z345bH/SphXo98mFbE72fI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mkJUaQvrwMeUKPOTtW4B3lZoDPhIycpT3z4iAD1m70TecYWFDYqfi2s30jH0vAKMmbLFUVl4wYmVTlWXI4Fs1RuJ9RP4DfgujT4BrA3i5+1jl0igK3EoLWN24F7rlleT6vYucSEb4CqSd6EecRn/bWgn8oF4Gnbw/xbmVDDpZHw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=eblCr0mD; 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="eblCr0mD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1EC00C4CEE3; Tue, 1 Apr 2025 01:00:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469210; bh=zBjSmBMX4dZbJFY4rTji9z345bH/SphXo98mFbE72fI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eblCr0mDoEgp1PjF72/Uwb52mwRY8WLbMlpHC6jY24woAiaoA/vP9Eo7xSI0b0zlo q+Bd+NKTqD14iph8ln6Xb4iBBtEZlAesy792Zb6rTtwI6lAV4fzwh59wjMDxXVynue uSjwm0NI75gP7NV3JqOooiEK/5YL3F5ManlGu1D3S9ShHRhhURF+CQJH8deYlOpa3n D7BsSGLj2mWOtDauCWF6aHcazBsCon3zGN8r9vKhLuIQmGpBnflTPCuxTECr+5WqdJ ePAC+201yxIebsUEi/1aY+xUFTH8GRrcLnD74p0BpWlca4a44CiTnQN26M/sMkkGb0 2O0edSrBXVv2A== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 05/31] terraform/OCI: Add a "Compute" Kconfig submenu Date: Mon, 31 Mar 2025 20:59:34 -0400 Message-ID: <20250401010000.764234-6-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 The image and shape are typically selected in the same panel on the OCI cloud console. Signed-off-by: Chuck Lever --- terraform/oci/Kconfig | 29 +++----------------------- terraform/oci/kconfigs/Kconfig.compute | 25 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 26 deletions(-) create mode 100644 terraform/oci/kconfigs/Kconfig.compute diff --git a/terraform/oci/Kconfig b/terraform/oci/Kconfig index 31bd2ca617f6..897501a5aebb 100644 --- a/terraform/oci/Kconfig +++ b/terraform/oci/Kconfig @@ -3,36 +3,13 @@ if TERRAFORM_OCI menu "Resource location" source "terraform/oci/kconfigs/Kconfig.location" endmenu +menu "Compute" +source "terraform/oci/kconfigs/Kconfig.compute" +endmenu menu "Identity & Access" source "terraform/oci/kconfigs/Kconfig.identity" endmenu -config TERRAFORM_OCI_SHAPE - string "OCI shape name" - help - The name of the shape - Read this: - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm - -config TERRAFORM_OCI_INSTANCE_FLEX_OCPUS - int "Number of flexiable instance OCPUs" - default 2 - help - The number of OCPUs to use per flexible instance. - -config TERRAFORM_OCI_INSTANCE_FLEX_MEMORY_IN_GBS - int "How much RAM to use per flexible instance in GB" - default 4 - help - How much GiB of RAM to use per flexible instance. - -config TERRAFORM_OCI_OS_IMAGE_OCID - string "OCI OS image OCID" - help - The OCI ID of the OS image to use. - Read this: - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm - config TERRAFORM_OCI_ASSIGN_PUBLIC_IP bool "Assign public IP address to the cloud instance" default y diff --git a/terraform/oci/kconfigs/Kconfig.compute b/terraform/oci/kconfigs/Kconfig.compute new file mode 100644 index 000000000000..b794ef2d5190 --- /dev/null +++ b/terraform/oci/kconfigs/Kconfig.compute @@ -0,0 +1,25 @@ +config TERRAFORM_OCI_SHAPE + string "OCI shape name" + help + The name of the shape + Read this: + https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm + +config TERRAFORM_OCI_INSTANCE_FLEX_OCPUS + int "Number of flexiable instance OCPUs" + default 2 + help + The number of OCPUs to use per flexible instance. + +config TERRAFORM_OCI_INSTANCE_FLEX_MEMORY_IN_GBS + int "How much RAM to use per flexible instance in GB" + default 4 + help + How much GiB of RAM to use per flexible instance. + +config TERRAFORM_OCI_OS_IMAGE_OCID + string "OCI OS image OCID" + help + The OCI ID of the OS image to use. + Read this: + https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm From patchwork Tue Apr 1 00:59:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034255 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 3684B2E3371 for ; Tue, 1 Apr 2025 01:00:11 +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=1743469211; cv=none; b=J8ClKXZYf0+9yc1VMd/hmgKlFxMOE2KV5DvzHPNqaj2UhHylFadPUaAT5PSmHw8n9IFFKpYnBWkv7ykSOhzc09Ybdtkgl8JUBk8CEKhTwonQSXcsyfsWDD6Fk3HuA9YZPqAJASWgfTihGcuh1tLrlRcryuthfVH2QLHmVu4eauU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469211; c=relaxed/simple; bh=uHybkdYx4KcX5wOx9MAMmEhB6clH5aSWAjLdru1y7cc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GF/ops/uRS8GJiuUhG5AVUDz9YLyurnYTYDNt1vTOuZR5IpwARm7gpDRK/EFt8/riVboaybhaW3Qd3iY9dQKcAaYOn4ExoHNr4IKmolJBGPoEVEqmKB/qLadurIdI0LjoR3LzB3K73iAZGdkpi0sWduw7LdxEfsjHw92SJFXvu0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nu23KvsR; 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="nu23KvsR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B1C1CC4CEEA; Tue, 1 Apr 2025 01:00:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469211; bh=uHybkdYx4KcX5wOx9MAMmEhB6clH5aSWAjLdru1y7cc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nu23KvsR38j0Lq14Jq6dnOSkbfQmPyQTknMLl+XPysLmPSuRjFtNAbndN1lDz351E VW7pdhWKuBCWOs+h2EL4AVrD0oA+bltzQfbu/FIVaQ+BqNlYcmz8VskHE+DOvSTraN ov5eHo+KGyP9a6El5x7rszp+LCzacYw8F26W3uUt3rZLOIDuDnQDp9jtcSMpnmEoew Gv4frjYlsGwq1YYPKJt+DA/ep4ZyhgcNkIK/fZworPr7WUhShwg3dSbnOWcIludolT 7ifrpkAOYdQ2Ska41tBEiyXnzJuxRCqu25feyA94irjjHilQYgrnZQxJv5FuLJZMc3 +EF64BMvslLkw== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 06/31] terraform/OCI: Add a "Storage" Kconfig submenu Date: Mon, 31 Mar 2025 20:59:35 -0400 Message-ID: <20250401010000.764234-7-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 Signed-off-by: Chuck Lever --- terraform/oci/Kconfig | 188 +----------------- .../oci/{Kconfig => kconfigs/Kconfig.storage} | 29 --- 2 files changed, 3 insertions(+), 214 deletions(-) copy terraform/oci/{Kconfig => kconfigs/Kconfig.storage} (86%) diff --git a/terraform/oci/Kconfig b/terraform/oci/Kconfig index 897501a5aebb..c0b820f2cc43 100644 --- a/terraform/oci/Kconfig +++ b/terraform/oci/Kconfig @@ -6,6 +6,9 @@ endmenu menu "Compute" source "terraform/oci/kconfigs/Kconfig.compute" endmenu +menu "Storage" +source "terraform/oci/kconfigs/Kconfig.storage" +endmenu menu "Identity & Access" source "terraform/oci/kconfigs/Kconfig.identity" endmenu @@ -25,189 +28,4 @@ config TERRAFORM_OCI_SUBNET_OCID Read this: https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm -config TERRAFORM_OCI_VOLUMES_ENABLE_EXTRA - bool "Enable additional block devices" - default n - help - Enable this to provision up to 10 extra block devices - on each target node. - -if TERRAFORM_OCI_VOLUMES_ENABLE_EXTRA - -choice - prompt "Count of extra block volumes" - default TERRAFORM_OCI_VOLUMES_PER_INSTANCE_4 - help - The count of extra block devices attached to each target - node. - -config TERRAFORM_OCI_VOLUMES_PER_INSTANCE_2 - bool "2" - help - Provision 2 extra volumes per target node. - -config TERRAFORM_OCI_VOLUMES_PER_INSTANCE_3 - bool "3" - help - Provision 3 extra volumes per target node. - -config TERRAFORM_OCI_VOLUMES_PER_INSTANCE_4 - bool "4" - help - Provision 4 extra volumes per target node. - -config TERRAFORM_OCI_VOLUMES_PER_INSTANCE_5 - bool "5" - help - Provision 5 extra volumes per target node. - -config TERRAFORM_OCI_VOLUMES_PER_INSTANCE_6 - bool "6" - help - Provision 6 extra volumes per target node. - -config TERRAFORM_OCI_VOLUMES_PER_INSTANCE_7 - bool "7" - help - Provision 7 extra volumes per target node. - -config TERRAFORM_OCI_VOLUMES_PER_INSTANCE_8 - bool "8" - help - Provision 8 extra volumes per target node. - -config TERRAFORM_OCI_VOLUMES_PER_INSTANCE_9 - bool "9" - help - Provision 9 extra volumes per target node. - -config TERRAFORM_OCI_VOLUMES_PER_INSTANCE_10 - bool "10" - help - Provision 10 extra volumes per target node. - -endchoice - -config TERRAFORM_OCI_VOLUMES_PER_INSTANCE - int - output yaml - default 2 if TERRAFORM_OCI_VOLUMES_PER_INSTANCE_2 - default 3 if TERRAFORM_OCI_VOLUMES_PER_INSTANCE_3 - default 4 if TERRAFORM_OCI_VOLUMES_PER_INSTANCE_4 - default 5 if TERRAFORM_OCI_VOLUMES_PER_INSTANCE_5 - default 6 if TERRAFORM_OCI_VOLUMES_PER_INSTANCE_6 - default 7 if TERRAFORM_OCI_VOLUMES_PER_INSTANCE_7 - default 8 if TERRAFORM_OCI_VOLUMES_PER_INSTANCE_8 - default 9 if TERRAFORM_OCI_VOLUMES_PER_INSTANCE_9 - default 10 if TERRAFORM_OCI_VOLUMES_PER_INSTANCE_10 - -choice - prompt "Volume size for each additional volume" - default TERRAFORM_OCI_VOLUMES_SIZE_50G - help - OCI implements volume sizes between 50G and 32T. In some - cases, 50G volumes are in the free tier. - -config TERRAFORM_OCI_VOLUMES_SIZE_50G - bool "50G" - help - Extra block volumes are 50 GiB in size. - -config TERRAFORM_OCI_VOLUMES_SIZE_64G - bool "64G" - help - Extra block volumes are 64 GiB in size. - -config TERRAFORM_OCI_VOLUMES_SIZE_128G - bool "128G" - help - Extra block volumes are 128 GiB in size. - -config TERRAFORM_OCI_VOLUMES_SIZE_256G - bool "256G" - help - Extra block volumes are 256 GiB in size. - -config TERRAFORM_OCI_VOLUMES_SIZE_512G - bool "512G" - help - Extra block volumes are 512 GiB in size. - -config TERRAFORM_OCI_VOLUMES_SIZE_1024G - bool "1024G" - help - Extra block volumes are 1024 GiB in size. - -config TERRAFORM_OCI_VOLUMES_SIZE_2048G - bool "2048G" - help - Extra block volumes are 2048 GiB in size. - -config TERRAFORM_OCI_VOLUMES_SIZE_4096G - bool "4096G" - help - Extra block volumes are 4096 GiB in size. - -config TERRAFORM_OCI_VOLUMES_SIZE_8192G - bool "8192G" - help - Extra block volumes are 8192 GiB in size. - -endchoice - -config TERRAFORM_OCI_VOLUMES_SIZE - int - output yaml - default 50 if TERRAFORM_OCI_VOLUMES_SIZE_50G - default 64 if TERRAFORM_OCI_VOLUMES_SIZE_64G - default 128 if TERRAFORM_OCI_VOLUMES_SIZE_128G - default 256 if TERRAFORM_OCI_VOLUMES_SIZE_256G - default 512 if TERRAFORM_OCI_VOLUMES_SIZE_512G - default 1024 if TERRAFORM_OCI_VOLUMES_SIZE_1024G - default 2048 if TERRAFORM_OCI_VOLUMES_SIZE_2048G - default 4096 if TERRAFORM_OCI_VOLUMES_SIZE_4096G - default 8192 if TERRAFORM_OCI_VOLUMES_SIZE_8192G - -endif # TERRAFORM_OCI_VOLUMES_ENABLE_EXTRA - -if !TERRAFORM_OCI_VOLUMES_ENABLE_EXTRA - -config TERRAFORM_OCI_DATA_VOLUME_DISPLAY_NAME - string "Display name to use for the data volume" - default "data" - help - Human readable data volume instance name - Read this: - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm - -endif # !TERRAFORM_OCI_VOLUMES_ENABLE_EXTRA - -config TERRAFORM_OCI_DATA_VOLUME_DEVICE_FILE_NAME - string "Data volume's device file name" - default "/dev/oracleoci/oraclevdb" - help - Data volume's device file name - Read this: - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm - -if !TERRAFORM_OCI_VOLUMES_ENABLE_EXTRA - -config TERRAFORM_OCI_SPARSE_VOLUME_DISPLAY_NAME - string "Display name to use for the sparse volume" - default "sparse" - help - Human readable sparse volume instance name - Read this: - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm - -endif # !TERRAFORM_OCI_VOLUMES_ENABLE_EXTRA - -config TERRAFORM_OCI_SPARSE_VOLUME_DEVICE_FILE_NAME - string "Sparse volume's device file name" - default "/dev/oracleoci/oraclevdc" - help - Sparse volume's device file name - Read this: - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm - endif # TERRAFORM_OCI diff --git a/terraform/oci/Kconfig b/terraform/oci/kconfigs/Kconfig.storage similarity index 86% copy from terraform/oci/Kconfig copy to terraform/oci/kconfigs/Kconfig.storage index 897501a5aebb..8b2885a07d63 100644 --- a/terraform/oci/Kconfig +++ b/terraform/oci/kconfigs/Kconfig.storage @@ -1,30 +1,3 @@ -if TERRAFORM_OCI - -menu "Resource location" -source "terraform/oci/kconfigs/Kconfig.location" -endmenu -menu "Compute" -source "terraform/oci/kconfigs/Kconfig.compute" -endmenu -menu "Identity & Access" -source "terraform/oci/kconfigs/Kconfig.identity" -endmenu - -config TERRAFORM_OCI_ASSIGN_PUBLIC_IP - bool "Assign public IP address to the cloud instance" - default y - help - Select this field if public IP address has to be assigned to - the cloud instance. Otherwise a public IP address is - assigned. - -config TERRAFORM_OCI_SUBNET_OCID - string "OCI Subnet OCID" - help - The OCI ID of the subnet. - Read this: - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm - config TERRAFORM_OCI_VOLUMES_ENABLE_EXTRA bool "Enable additional block devices" default n @@ -209,5 +182,3 @@ config TERRAFORM_OCI_SPARSE_VOLUME_DEVICE_FILE_NAME Sparse volume's device file name Read this: https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm - -endif # TERRAFORM_OCI From patchwork Tue Apr 1 00:59:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034256 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 392E82AEFB for ; Tue, 1 Apr 2025 01:00:11 +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=1743469212; cv=none; b=Ulmri5uRklvBZ7IYAmethQNjPc/X0zrSYgVtzv5bSHSWPbvFdLbsEq8e5z/10BbezEdmabAPwBaBBbL2cjf2yW+mlWeR4Ml3ndBWVDDH7j5Exx7C8rK83MvbTbEkcB1wwhewN4yJWX3w7W8Qk9mMTnWQ/K0uyc1tIVezzc7xzxc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469212; c=relaxed/simple; bh=DldgQLAbvc16IfPLycJkfglX2ZCQUwp3sYZoiRiw/nQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ix9WVc+ItdZLFEWKd+9t4tv7Pz3S88mlPoHugJJ9PHJvmON04yfhZPogwqhKA8T+/o7KId6tFLGsS9Nxf6Xa6GrHd+lVqSQHZ/8o9/eoPXaXT29QmXRuJP3BKYw7y4Lax1HlpUaiW0fqWLL3wDAygihD1oElFhrSavFmO9JFQlI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TlBnNyiL; 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="TlBnNyiL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 53F61C4CEE3; Tue, 1 Apr 2025 01:00:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469211; bh=DldgQLAbvc16IfPLycJkfglX2ZCQUwp3sYZoiRiw/nQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TlBnNyiLv7IQHy6ndayiVedLK2slDvUQW1BK/AgH1cRdCiI9MdwV3pPpKOiHkOqJ5 cbRY0odIGkQi2fkT9zl7wPQZOjMEM6mB6pvBeFmZJOFd5f/njHIJuzgYwlX0vAv8ko 61EXe+/G77BOUi+pwW77scn6StRDehQK91w4OX6AdhloJ5tERmLV28air7tKAke6zd 7IzoDArVNXl4Hzcu7LNQ7mrqPLo1x5sTGJ5b/EdHc67EhiE4wGkQPyp36RiHQi1a/9 GkMM+2pUU/pkR8d04SvHmmx2vMQtDaUeSPilWDqoCpv3ZWmDHQFJAIOUu95z3F65TT zcB3FG42jGdgw== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 07/31] terraform/OCI: Add a "Networking" Kconfig submenu Date: Mon, 31 Mar 2025 20:59:36 -0400 Message-ID: <20250401010000.764234-8-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 Signed-off-by: Chuck Lever --- terraform/oci/Kconfig | 18 +++--------------- terraform/oci/kconfigs/Kconfig.network | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 15 deletions(-) create mode 100644 terraform/oci/kconfigs/Kconfig.network diff --git a/terraform/oci/Kconfig b/terraform/oci/Kconfig index c0b820f2cc43..566442868a8b 100644 --- a/terraform/oci/Kconfig +++ b/terraform/oci/Kconfig @@ -9,23 +9,11 @@ endmenu menu "Storage" source "terraform/oci/kconfigs/Kconfig.storage" endmenu +menu "Network" +source "terraform/oci/kconfigs/Kconfig.network" +endmenu menu "Identity & Access" source "terraform/oci/kconfigs/Kconfig.identity" endmenu -config TERRAFORM_OCI_ASSIGN_PUBLIC_IP - bool "Assign public IP address to the cloud instance" - default y - help - Select this field if public IP address has to be assigned to - the cloud instance. Otherwise a public IP address is - assigned. - -config TERRAFORM_OCI_SUBNET_OCID - string "OCI Subnet OCID" - help - The OCI ID of the subnet. - Read this: - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm - endif # TERRAFORM_OCI diff --git a/terraform/oci/kconfigs/Kconfig.network b/terraform/oci/kconfigs/Kconfig.network new file mode 100644 index 000000000000..ab1914c6f6a6 --- /dev/null +++ b/terraform/oci/kconfigs/Kconfig.network @@ -0,0 +1,14 @@ +config TERRAFORM_OCI_ASSIGN_PUBLIC_IP + bool "Assign public IP address to the cloud instance" + default y + help + Select this field if public IP address has to be assigned to + the cloud instance. Otherwise a public IP address is + assigned. + +config TERRAFORM_OCI_SUBNET_OCID + string "OCI Subnet OCID" + help + The OCI ID of the subnet. + Read this: + https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm From patchwork Tue Apr 1 00:59:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034257 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 656017E0E8 for ; Tue, 1 Apr 2025 01:00:12 +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=1743469212; cv=none; b=U+LIWQByOOnXXAbS/FmjlCuBnwoymxB89Pw8il2MqPkMGE7XGtRw+/+X0hUZhTSw3hkAEjoknz2lmGD/nIleOO3SQV7ol75RqvAQRL4jW9Cu189aJrDKPkExB1i2iYvqe6SjNEXcGVBWjT2e9gd/UWq93WrCXxfIDwk1i1E0OU8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469212; c=relaxed/simple; bh=ndzEGUjlnkfBHRdZ+fSleavEDD2fEdSDkpWfYvblCks=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NauadEci02NAkPEDxvJTGTuSJURpSY9bTvzWzoPsJqDi+ICXtQZ9vAdROgHcU8Pt6pJ775jfrQLFliooxTVxK7UNy2/ZxbUonqUEGoNl2S46XkIrHSZaeUVSgFayEV18RRah5m1lqjHK2FXK7ULy8DOwzTF9cIzBaGhC+7qSRtU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hJwPpCtV; 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="hJwPpCtV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E3972C4CEEB; Tue, 1 Apr 2025 01:00:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469212; bh=ndzEGUjlnkfBHRdZ+fSleavEDD2fEdSDkpWfYvblCks=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hJwPpCtV1uAx7EnXN5evmFQ6oUPazLg+U1ecfQhkzx2g25vscpLMQAb+J8rC567Pl r8G1IvwDTvHHJaR453pZBM/M9l5EVXJe9x95YWmC/SbF4T89YpTKLdu+EEZQBkww4D VZ9ANDqY6dG05vbUDIOROGubTP3z+ywytOwZkWxI7IJAatc9vQSaVVMqL6SfHNEJhn RBs6LC+3POZQPZ/dt3HrHwzbr1q6hUCyEpT2TIro07iaojEs5VrS3KbOGJqLbKKFc1 77w2yDF2cE7if9rpe4NRBnjPFqJ8uA7J/WUySWMon4zbrAwT2f1VR53uVQoAa7aTG3 8BMIzpKtxJP0A== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 08/31] terraform/OCI: Use "output yaml" for the tenancy OCID Date: Mon, 31 Mar 2025 20:59:37 -0400 Message-ID: <20250401010000.764234-9-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 Refactor: Remove the line in terraform.Makefile that sets "terraform_oci_tenancy_ocid", and just pass it directly from Kconfig via an "output yaml" directive. As an additional clean up, update the help text. Signed-off-by: Chuck Lever --- scripts/terraform.Makefile | 1 - terraform/oci/kconfigs/Kconfig.identity | 10 ++++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile index 3235c1af84b9..1589585cd2bd 100644 --- a/scripts/terraform.Makefile +++ b/scripts/terraform.Makefile @@ -96,7 +96,6 @@ endif ifeq (y,$(CONFIG_TERRAFORM_OCI)) TERRAFORM_EXTRA_VARS += terraform_oci_region=$(subst ",,$(CONFIG_TERRAFORM_OCI_REGION)) -TERRAFORM_EXTRA_VARS += terraform_oci_tenancy_ocid=$(subst ",,$(CONFIG_TERRAFORM_OCI_TENANCY_OCID)) TERRAFORM_EXTRA_VARS += terraform_oci_user_ocid=$(subst ",,$(CONFIG_TERRAFORM_OCI_USER_OCID)) TERRAFORM_EXTRA_VARS += terraform_oci_user_private_key_path=$(subst ",,$(CONFIG_TERRAFORM_OCI_USER_PRIVATE_KEY_PATH)) TERRAFORM_EXTRA_VARS += terraform_oci_user_fingerprint=$(subst ",,$(CONFIG_TERRAFORM_OCI_USER_FINGERPRINT)) diff --git a/terraform/oci/kconfigs/Kconfig.identity b/terraform/oci/kconfigs/Kconfig.identity index 928c700d9bd4..3061c12f6de0 100644 --- a/terraform/oci/kconfigs/Kconfig.identity +++ b/terraform/oci/kconfigs/Kconfig.identity @@ -1,9 +1,11 @@ config TERRAFORM_OCI_TENANCY_OCID - string "OCI tenant OCID" + string "OCI tenancy OCID" + output yaml help - The OCI ID of the tenancy to use. - Read this: - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm + The OCID of the tenancy in which to create kdevops + resources. See: + + https://docs.oracle.com/en-us/iaas/Content/API/Concepts/apisigningkey.htm#five config TERRAFORM_OCI_USER_OCID string "OCI user OCID" From patchwork Tue Apr 1 00:59:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034258 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 04A837E0E8 for ; Tue, 1 Apr 2025 01:00:13 +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=1743469213; cv=none; b=A6EnqPPiGu7pB+2Qd1VfWTUQfBUcQLoj4DzF1B3NbF94prpsVzuGf/eU9KLkDvUZ843JIlT+v/0LAwpJAmvTa4IRWeGfbipMhDUTr5zwMTV1grocGjsUDvhRsv0+iiNs0XMn4jHDYPIHyD4riOhIN5XioosYEww2A4M0wzOiIpY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469213; c=relaxed/simple; bh=QC8rkNw57mkJpu6xmuo/4ITkBhxvptvcKFweDpq3fhs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PkfJdzBk0F/t57UqAKNfMUsExQZ4nuVxvNXD5LkGRRqiwTGfg6xvZ+P+u0J9XVCC+D56SWjPMgmxcSgM/Bhwfz53o65G+vk9Sayio3I8i09LyNwDmrUWCo06WHLRWbwXpf6FMx4UNmJJNLLN+uajrTE1oMorip0yJH6EM5yEPvM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=P7OCk2D0; 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="P7OCk2D0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8351AC4CEE5; Tue, 1 Apr 2025 01:00:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469212; bh=QC8rkNw57mkJpu6xmuo/4ITkBhxvptvcKFweDpq3fhs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P7OCk2D0ba2GEOF4ysGXYwdyx5yIX/9KHVrmV6k+a4g6/fsWWlnqEjzMjT+5GMjD7 mIjPJBqGAWnEucVvDgdthPLRwtpzKtlE7EDAZNflbMrF+iVI1FGHBmOXlB2ogyXU7c fmeZrq+4WP9uoN1o2V8dWKmrn2+qcBy1X/vhaHToLjFDXoYUnjSnWZYCjxFmV9GXfT 6REENfcDpKtTUPpBNAKMLPGu5cNstyMZA6B3VBl4KzbCknoLePi9DGpd9JYA3BzqBo rwGs2EfbCJP4OOBj47h+nKmSyanl+Oli1rNzveX3ncBztMjMCfTYOmf6BT77zCN2tP hMXILXbTxejUQ== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 09/31] terraform/OCI: Use "output yaml" for the user OCID Date: Mon, 31 Mar 2025 20:59:38 -0400 Message-ID: <20250401010000.764234-10-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 Refactor: Remove the line in terraform.Makefile that sets "terraform_oci_user_ocid", and just pass it directly from Kconfig via an "output yaml" directive. As an additional clean up, update the help text. Signed-off-by: Chuck Lever --- scripts/terraform.Makefile | 1 - terraform/oci/kconfigs/Kconfig.identity | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile index 1589585cd2bd..aced091fa08c 100644 --- a/scripts/terraform.Makefile +++ b/scripts/terraform.Makefile @@ -96,7 +96,6 @@ endif ifeq (y,$(CONFIG_TERRAFORM_OCI)) TERRAFORM_EXTRA_VARS += terraform_oci_region=$(subst ",,$(CONFIG_TERRAFORM_OCI_REGION)) -TERRAFORM_EXTRA_VARS += terraform_oci_user_ocid=$(subst ",,$(CONFIG_TERRAFORM_OCI_USER_OCID)) TERRAFORM_EXTRA_VARS += terraform_oci_user_private_key_path=$(subst ",,$(CONFIG_TERRAFORM_OCI_USER_PRIVATE_KEY_PATH)) TERRAFORM_EXTRA_VARS += terraform_oci_user_fingerprint=$(subst ",,$(CONFIG_TERRAFORM_OCI_USER_FINGERPRINT)) TERRAFORM_EXTRA_VARS += terraform_oci_availablity_domain=$(subst ",,$(CONFIG_TERRAFORM_OCI_AVAILABLITY_DOMAIN)) diff --git a/terraform/oci/kconfigs/Kconfig.identity b/terraform/oci/kconfigs/Kconfig.identity index 3061c12f6de0..392ac584a567 100644 --- a/terraform/oci/kconfigs/Kconfig.identity +++ b/terraform/oci/kconfigs/Kconfig.identity @@ -9,10 +9,12 @@ config TERRAFORM_OCI_TENANCY_OCID config TERRAFORM_OCI_USER_OCID string "OCI user OCID" + output yaml help - The OCI ID of the user to use. - Read this: - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm + The OCID of the cloud user that kdevops should authenticate as. + See: + + https://docs.oracle.com/en-us/iaas/Content/API/Concepts/apisigningkey.htm#five config TERRAFORM_OCI_USER_PRIVATE_KEY_PATH string "OCI user private key path" From patchwork Tue Apr 1 00:59:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034259 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 0149C3C3C for ; Tue, 1 Apr 2025 01:00:13 +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=1743469214; cv=none; b=ieZ34OMt6/Ix5PSKU3wxdSJUsZ4ot91US95Gztw1JvNoKOcugjFpds0aBZ33pFa/Udy63TLPSYTmV7m6mwejqQ2zMC59s3575BevPwoaML5yzrDagTG/pg/8cNA4tnyZwTyt0vJw/XfwOEgcE35DVWDPN/3DJ2uBkarDJRSp54s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469214; c=relaxed/simple; bh=eLJn/f4sZCJ5jQOvEV8w4AdrTyIjNeumFfHakN3shso=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aoxlu0FLu9uZW0/WbB73fGGBhiGiGEskO6TubT9pcuVXmU+gpq4A4ujVjLWhbSxtu1MWtcpD1P9u3pwNujP5OuqI83Vf7xcN6COjwj6F9Rn79HIFJunlouPLiNvYHoLL6+q+mvj/RXv6XN/9+FzuokPsyYZLfWlXixdBRCeeHJY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=U77i3dUr; 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="U77i3dUr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1F2FEC4CEEA; Tue, 1 Apr 2025 01:00:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469213; bh=eLJn/f4sZCJ5jQOvEV8w4AdrTyIjNeumFfHakN3shso=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U77i3dUrRVIcyaa6wDUVmAlM2iQFtRMKOQNKmt+uOB+58B9YEYqkWjaWfBv+GBQlx HJViXigsw5rWOy9xj91Lz5Y7RAu//fqDH8FKPb82ARBVXocPtgoyn+Wy6BMx3qq6fY SN7BsRcwRlJXYGre9gfaj6cy0n1hUglS8NuKpbl5ih/FWat5JOJGPh7WaVk0HgtkIg yQOyEswkkEO3i4XCC+5c+f7InmHZdO9vEWHOtEPV8pg0D/xABbh1GnWwaLFW1tjInw wUIwfT1ZdrXyV0DtkG5nJ5a9FQDK75hek806Ttuy+GMRcGMpGtyTD7B8rDXVi3Avqn q5iKOyA4j5PHg== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 10/31] terraform/OCI: Use "output yaml" for the signing key Date: Mon, 31 Mar 2025 20:59:39 -0400 Message-ID: <20250401010000.764234-11-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 Refactor: Remove the line in terraform.Makefile that sets "terraform_oci_user_private_key_path" and just pass it directly from Kconfig via an "output yaml" directive. As an additional clean up, update the help text. Signed-off-by: Chuck Lever --- scripts/terraform.Makefile | 1 - terraform/oci/kconfigs/Kconfig.identity | 11 +++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile index aced091fa08c..b631b4c09a0e 100644 --- a/scripts/terraform.Makefile +++ b/scripts/terraform.Makefile @@ -96,7 +96,6 @@ endif ifeq (y,$(CONFIG_TERRAFORM_OCI)) TERRAFORM_EXTRA_VARS += terraform_oci_region=$(subst ",,$(CONFIG_TERRAFORM_OCI_REGION)) -TERRAFORM_EXTRA_VARS += terraform_oci_user_private_key_path=$(subst ",,$(CONFIG_TERRAFORM_OCI_USER_PRIVATE_KEY_PATH)) TERRAFORM_EXTRA_VARS += terraform_oci_user_fingerprint=$(subst ",,$(CONFIG_TERRAFORM_OCI_USER_FINGERPRINT)) TERRAFORM_EXTRA_VARS += terraform_oci_availablity_domain=$(subst ",,$(CONFIG_TERRAFORM_OCI_AVAILABLITY_DOMAIN)) TERRAFORM_EXTRA_VARS += terraform_oci_compartment_ocid=$(subst ",,$(CONFIG_TERRAFORM_OCI_COMPARTMENT_OCID)) diff --git a/terraform/oci/kconfigs/Kconfig.identity b/terraform/oci/kconfigs/Kconfig.identity index 392ac584a567..87f5457995f5 100644 --- a/terraform/oci/kconfigs/Kconfig.identity +++ b/terraform/oci/kconfigs/Kconfig.identity @@ -17,11 +17,14 @@ config TERRAFORM_OCI_USER_OCID https://docs.oracle.com/en-us/iaas/Content/API/Concepts/apisigningkey.htm#five config TERRAFORM_OCI_USER_PRIVATE_KEY_PATH - string "OCI user private key path" + string "Pathname to private key file" + output yaml help - Path to the file containing the private key of the user. - Read this: - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm + Pathname to the local file containing the signing key of + the user. You can upload an pre-existing key, or generate + one on the OCI cloud console and download it. See: + + https://docs.oracle.com/en-us/iaas/Content/API/Concepts/apisigningkey.htm#two config TERRAFORM_OCI_USER_FINGERPRINT string "OCI user fingerprint" From patchwork Tue Apr 1 00:59:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034260 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 311A98472 for ; Tue, 1 Apr 2025 01:00:14 +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=1743469214; cv=none; b=FAM1ZL9e1dqUDZbNTVTcW5R+Fd7v6XqbJsIn2blHRvLkmTQe8zkxTk97ag5idUVP9F7Gq6CmCeCFN9gajwx+ZmXrnFBRz/1pz0lM5zLbc2mIldVE5dfQIt4RUy1RWpSu0eTNRdD9XP4bosiiLcQN1gw34vvP+SGyBo5D+7WNvXI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469214; c=relaxed/simple; bh=jQ90qyyGuoDaDw2la5U5Rk1l8K0/hUcwepHrHJGV4Gw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ondKW6dJW6lRfBz7TVWEZ+d6g84fWUQzsbwVZMU+T5Lzd8LftNWfSPASkQMO197dSfXMW/2y9x27hEdzKAgmU+mUzTTPk2rXGpfGltbXKqQQTqvmuzLzCz5Wav7r+Nb1Qx57tgpVWE9zhtN7z3I1zfQb0WL0mIO6CEtfUAwbHrc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LxTqvXeI; 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="LxTqvXeI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B1F42C4CEE5; Tue, 1 Apr 2025 01:00:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469214; bh=jQ90qyyGuoDaDw2la5U5Rk1l8K0/hUcwepHrHJGV4Gw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LxTqvXeIFsbt5eykqLihktRvCfOwLjLXeWxR0qWgO4h5W+XCSbL7tohniz9y2SwDY mEWh6kWM2ABYXFdWYRH+3em1KHcTmVNYb+7U51iuRUyksrbg1WkgG8EoWLsR30nuf5 CwDx0+MibbQZx6evM+Vx7tLDGT5tgScIjja4jGGKclNgGGi6s1/P6IOVPiiitMdnet 16NFH11kWacBi4AWmwT05iCzxlZFwRXY133fVVyY7SUHl1Aa5Belbfdlh2qjU1KoYg 1Nyo2Lbr6Dp3QmpKY8/il7xsy67HhGJ0ePnytzieZggfQIkKqxTX6XADhEEiTarUTS OpRDUAwufnq7g== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 11/31] terraform/OCI: Use "output yaml" for the fingerprint Date: Mon, 31 Mar 2025 20:59:40 -0400 Message-ID: <20250401010000.764234-12-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 Refactor: Remove the line in terraform.Makefile that sets "terraform_oci_user_fingerprint" and just pass it directly from Kconfig via an "output yaml" directive. As an additional clean up, update the help text. Signed-off-by: Chuck Lever --- scripts/terraform.Makefile | 1 - terraform/oci/kconfigs/Kconfig.identity | 9 +++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile index b631b4c09a0e..75ba9b97b518 100644 --- a/scripts/terraform.Makefile +++ b/scripts/terraform.Makefile @@ -96,7 +96,6 @@ endif ifeq (y,$(CONFIG_TERRAFORM_OCI)) TERRAFORM_EXTRA_VARS += terraform_oci_region=$(subst ",,$(CONFIG_TERRAFORM_OCI_REGION)) -TERRAFORM_EXTRA_VARS += terraform_oci_user_fingerprint=$(subst ",,$(CONFIG_TERRAFORM_OCI_USER_FINGERPRINT)) TERRAFORM_EXTRA_VARS += terraform_oci_availablity_domain=$(subst ",,$(CONFIG_TERRAFORM_OCI_AVAILABLITY_DOMAIN)) TERRAFORM_EXTRA_VARS += terraform_oci_compartment_ocid=$(subst ",,$(CONFIG_TERRAFORM_OCI_COMPARTMENT_OCID)) TERRAFORM_EXTRA_VARS += terraform_oci_shape=$(subst ",,$(CONFIG_TERRAFORM_OCI_SHAPE)) diff --git a/terraform/oci/kconfigs/Kconfig.identity b/terraform/oci/kconfigs/Kconfig.identity index 87f5457995f5..310cf19b7ca1 100644 --- a/terraform/oci/kconfigs/Kconfig.identity +++ b/terraform/oci/kconfigs/Kconfig.identity @@ -27,8 +27,9 @@ config TERRAFORM_OCI_USER_PRIVATE_KEY_PATH https://docs.oracle.com/en-us/iaas/Content/API/Concepts/apisigningkey.htm#two config TERRAFORM_OCI_USER_FINGERPRINT - string "OCI user fingerprint" + string "Signing key fingerprint" + output yaml help - Fingerprint for the key pair being used. - Read this: - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm + Fingerprint for the signing key pair. See: + + https://docs.oracle.com/en-us/iaas/Content/API/Concepts/apisigningkey.htm#four From patchwork Tue Apr 1 00:59:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034261 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 3BDE4F510 for ; Tue, 1 Apr 2025 01:00:14 +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=1743469215; cv=none; b=VrHNpPRSnU/PioDTsII9I8QFkB0Q58Pmdby+FBKfRLQ6tOZxdzkUaLN12ZftGBr7yGOs21BtGge+lrXFBsosFenxMCOkkyBzbIvoIpFe+Sca697n5dAvQ2knOQ520J+so8VUB6YNXRtQQIVIhMLRBvJtz48yImzDfvf+mfQTXwM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469215; c=relaxed/simple; bh=g39U5G2QqsXDoUCYLgr3/GnwvGxfSA2HQZ5mJkEhWX4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FwSWbaiIUXkP4XSkHOZjWvmuQj4zO/baqXw5I3HDvEcdQn+30QDqAJat9anIneK6y8TDSnm529IfnlxXJO+mrT8QYp8qT0O3/qwDCqgYrm3+iP2j4BJ8GxuEQ9NvTtqugv4LOGbnnEfVcYHRkgGpCA38l8eFjvC8vNFNK0+2FaM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nM/2RHdx; 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="nM/2RHdx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4D268C4CEEB; Tue, 1 Apr 2025 01:00:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469214; bh=g39U5G2QqsXDoUCYLgr3/GnwvGxfSA2HQZ5mJkEhWX4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nM/2RHdx6mVMRX7XvWReC7Sfbmea2WULFZzZtPz0jbJ6C6pAj0gncnpqZIyFqN0dw 6pJ0UUgPW3VVzQ91xkvWEBTgFMxwJc3NsJDj+iOMP7LvR0wZH0726NKZcNB784Fzxg Ilqhb6DwP6oCXKmkZlElQrEpUwMuiUj6i0u3gAjbFPdqoCsB6u+pO/rNXsxv/OkNoc yki9Y9wtXmouh2aGBk5w3K0fZupb3d/ejwqUgUbih8fqk9UByMKVyC3XnZXmUrrc1l /UFvZ2/yfNObr/PgAuhc9vgroTtFL4nEmpsnp5v8MqAU5ErUcmyyPQh1B1rhX4Qr8M 38PT5PIB6nmhw== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 12/31] terraform/OCI: Add a Region selector Date: Mon, 31 Mar 2025 20:59:41 -0400 Message-ID: <20250401010000.764234-13-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 Replace the free-form string region setting with a selector that chooses among already-validated settings. Some popular regions in the "commercial" realm are added. It should be easy to add more. Signed-off-by: Chuck Lever --- scripts/terraform.Makefile | 1 - terraform/oci/kconfigs/Kconfig.location | 53 ++++++++++++++++++++++--- 2 files changed, 48 insertions(+), 6 deletions(-) diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile index 75ba9b97b518..ea5309d5da2e 100644 --- a/scripts/terraform.Makefile +++ b/scripts/terraform.Makefile @@ -95,7 +95,6 @@ TERRAFORM_EXTRA_VARS += terraform_gce_credentials=$(subst ",,$(CONFIG_TERRAFORM_ endif ifeq (y,$(CONFIG_TERRAFORM_OCI)) -TERRAFORM_EXTRA_VARS += terraform_oci_region=$(subst ",,$(CONFIG_TERRAFORM_OCI_REGION)) TERRAFORM_EXTRA_VARS += terraform_oci_availablity_domain=$(subst ",,$(CONFIG_TERRAFORM_OCI_AVAILABLITY_DOMAIN)) TERRAFORM_EXTRA_VARS += terraform_oci_compartment_ocid=$(subst ",,$(CONFIG_TERRAFORM_OCI_COMPARTMENT_OCID)) TERRAFORM_EXTRA_VARS += terraform_oci_shape=$(subst ",,$(CONFIG_TERRAFORM_OCI_SHAPE)) diff --git a/terraform/oci/kconfigs/Kconfig.location b/terraform/oci/kconfigs/Kconfig.location index 9e06aa9332f8..9ef81cedd235 100644 --- a/terraform/oci/kconfigs/Kconfig.location +++ b/terraform/oci/kconfigs/Kconfig.location @@ -1,9 +1,52 @@ -config TERRAFORM_OCI_REGION - string "OCI Region" +choice + prompt "OCI Region" + default TERRAFORM_OCI_REGION_ORD help - This option will set the OCI resource location. - Read this: - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm + A region is a collection of geographically co-located data + centers that share data and hardware resources. Using this + menu, select the region in which you wish to deploy your + kdevops resources. Your tenancy must be subscribed to the + selected region. For more information: + + https://docs.oracle.com/en-us/iaas/Content/General/Concepts/regions.htm + +config TERRAFORM_OCI_REGION_HYD + bool "India South (Hyderabad)" + +config TERRAFORM_OCI_REGION_BOM + bool "India West (Mumbai)" + +config TERRAFORM_OCI_REGION_YUL + bool "Canada Southeast (Montreal)" + +config TERRAFORM_OCI_REGION_YYZ + bool "Canada Southeast (Toronto)" + +config TERRAFORM_OCI_REGION_IAD + bool "US East (Ashburn)" + +config TERRAFORM_OCI_REGION_ORD + bool "US Midwest (Chicago)" + +config TERRAFORM_OCI_REGION_PHX + bool "US West (Phoenix)" + +config TERRAFORM_OCI_REGION_SJC + bool "US West (San Jose)" + +endchoice + +config TERRAFORM_OCI_REGION + string + output yaml + default "ap-hyderabad-1" if TERRAFORM_OCI_REGION_HYD + default "ap-mumbai-1" if TERRAFORM_OCI_REGION_BOM + default "ca-montreal-1" if TERRAFORM_OCI_REGION_YUL + default "ca-toronto-1" if TERRAFORM_OCI_REGION_YYZ + default "us-ashburn-1" if TERRAFORM_OCI_REGION_IAD + default "us-chicago-1" if TERRAFORM_OCI_REGION_ORD + default "us-phoenix-1" if TERRAFORM_OCI_REGION_PHX + default "us-sanjose-1" if TERRAFORM_OCI_REGION_SJC config TERRAFORM_OCI_AVAILABLITY_DOMAIN string "OCI availablity domain" From patchwork Tue Apr 1 00:59:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034262 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 5E5472E3371 for ; Tue, 1 Apr 2025 01:00:15 +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=1743469215; cv=none; b=Emi0asY1oRQXcnWGnZsRmgY03Z4Ku08QfPS0gD++JeRIjsSMmDmJfvcopQKklwad90aYGcN+2JGOcw3JhfWY5wA6whzDzf5ySsQgQqJul7r3UV1yk5rv5bitky9Ew3sLJE+Xfy/wPnaHpQy1RUsg7uAor7Zk4FokEitAtQULvPs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469215; c=relaxed/simple; bh=0dQL5VnJtc1ka1u0DMVaNGu9TiV60JlT5cP8pv7q1OU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jAiv7OUYmFTiIFTrI7tvn9Eg4U0basRc8Ie7tIGtXjOI7rWbPTRHS/yaQJGHDCz3EURaXS5zM9G1wmnW7RfrJ7aNWEA2MeO1SQWeGsf4dRbh2gP+oS7bAgVBYTB2BmEproSPEXAUnK3QfW7J9WaKU31yVGzYxvl+y+SuZyqkTfo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=V/Ys65v1; 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="V/Ys65v1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DD09DC4CEEA; Tue, 1 Apr 2025 01:00:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469215; bh=0dQL5VnJtc1ka1u0DMVaNGu9TiV60JlT5cP8pv7q1OU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V/Ys65v1a3pqwR95NIPX7LrcC6XD5ChoDx9RHDUcsTNuSrhyq0vNxMDcdGpJPX66D bEn2XDXj9h99a/dqIarkVSalADwzaO6jbhS/TV9k7sk6TLJ+cif9aTFkVdC82EmeR1 wQPXXf3/yHrgtl+9CaHWf6etjpJSsYZf6nlSdRNze/Rjrd/GHDWULpbNdyLnhVkOls w9HMTkL3pLJ549JSwyX6FpKqCmAtRpQpa1Q9szCsfPE7kQTaxiFz0iYjk30sgOt1mg xTUOJ7EyY8ncicuMY1yTHsev7yqbfOSMJSRtc5hRZYbdRHYsLxcEoCuEWWjrnuy8v7 0igc0ltlGfHbg== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 13/31] terraform/OCI: Add an availability domain selector Date: Mon, 31 Mar 2025 20:59:42 -0400 Message-ID: <20250401010000.764234-14-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 In order to balance load, OCI adds a prefix to availability domain names. This prefix is fixed but unique for each user. The user has to look up the prefixed name (at least once) before specifying an availability domain name for terraform, which is not user-friendly. Fortunately, terraform provides a data source to look up the user's unique prefix and form the correct full domain name for terraform. So the Kconfig selector only needs to pick an integer from 1 to 3, and that hides a needless detail from our user. Signed-off-by: Chuck Lever --- .../templates/oci/terraform.tfvars.j2 | 2 +- scripts/terraform.Makefile | 1 - terraform/oci/kconfigs/Kconfig.location | 26 +++++--------- .../kconfigs/regions/Kconfig.ap-hyderabad-1 | 28 +++++++++++++++ .../oci/kconfigs/regions/Kconfig.ap-mumbai-1 | 27 ++++++++++++++ .../kconfigs/regions/Kconfig.ca-montreal-1 | 28 +++++++++++++++ .../oci/kconfigs/regions/Kconfig.ca-toronto-1 | 28 +++++++++++++++ .../oci/kconfigs/regions/Kconfig.us-ashburn-1 | 36 +++++++++++++++++++ .../oci/kconfigs/regions/Kconfig.us-chicago-1 | 36 +++++++++++++++++++ .../oci/kconfigs/regions/Kconfig.us-phoenix-1 | 36 +++++++++++++++++++ .../oci/kconfigs/regions/Kconfig.us-sanjose-1 | 28 +++++++++++++++ terraform/oci/main.tf | 15 ++++---- terraform/oci/vars.tf | 10 +++--- 13 files changed, 270 insertions(+), 31 deletions(-) create mode 100644 terraform/oci/kconfigs/regions/Kconfig.ap-hyderabad-1 create mode 100644 terraform/oci/kconfigs/regions/Kconfig.ap-mumbai-1 create mode 100644 terraform/oci/kconfigs/regions/Kconfig.ca-montreal-1 create mode 100644 terraform/oci/kconfigs/regions/Kconfig.ca-toronto-1 create mode 100644 terraform/oci/kconfigs/regions/Kconfig.us-ashburn-1 create mode 100644 terraform/oci/kconfigs/regions/Kconfig.us-chicago-1 create mode 100644 terraform/oci/kconfigs/regions/Kconfig.us-phoenix-1 create mode 100644 terraform/oci/kconfigs/regions/Kconfig.us-sanjose-1 diff --git a/playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2 b/playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2 index f7b9ffb48c64..864d5d5a89f0 100644 --- a/playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2 +++ b/playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2 @@ -3,7 +3,7 @@ oci_tenancy_ocid = "{{ terraform_oci_tenancy_ocid }}" oci_user_ocid = "{{ terraform_oci_user_ocid }}" oci_user_private_key_path = "{{ terraform_oci_user_private_key_path }}" oci_user_fingerprint = "{{ terraform_oci_user_fingerprint }}" -oci_availablity_domain = "{{ terraform_oci_availablity_domain }}" +oci_ad_number = {{ terraform_oci_ad_number }} oci_compartment_ocid = "{{ terraform_oci_compartment_ocid }}" oci_shape = "{{ terraform_oci_shape }}" oci_instance_flex_ocpus = {{ terraform_oci_instance_flex_ocpus }} diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile index ea5309d5da2e..0aca0b508086 100644 --- a/scripts/terraform.Makefile +++ b/scripts/terraform.Makefile @@ -95,7 +95,6 @@ TERRAFORM_EXTRA_VARS += terraform_gce_credentials=$(subst ",,$(CONFIG_TERRAFORM_ endif ifeq (y,$(CONFIG_TERRAFORM_OCI)) -TERRAFORM_EXTRA_VARS += terraform_oci_availablity_domain=$(subst ",,$(CONFIG_TERRAFORM_OCI_AVAILABLITY_DOMAIN)) TERRAFORM_EXTRA_VARS += terraform_oci_compartment_ocid=$(subst ",,$(CONFIG_TERRAFORM_OCI_COMPARTMENT_OCID)) TERRAFORM_EXTRA_VARS += terraform_oci_shape=$(subst ",,$(CONFIG_TERRAFORM_OCI_SHAPE)) TERRAFORM_EXTRA_VARS += terraform_oci_instance_flex_ocpus=$(subst ",,$(CONFIG_TERRAFORM_OCI_INSTANCE_FLEX_OCPUS)) diff --git a/terraform/oci/kconfigs/Kconfig.location b/terraform/oci/kconfigs/Kconfig.location index 9ef81cedd235..7bf5ae49ba03 100644 --- a/terraform/oci/kconfigs/Kconfig.location +++ b/terraform/oci/kconfigs/Kconfig.location @@ -36,24 +36,14 @@ config TERRAFORM_OCI_REGION_SJC endchoice -config TERRAFORM_OCI_REGION - string - output yaml - default "ap-hyderabad-1" if TERRAFORM_OCI_REGION_HYD - default "ap-mumbai-1" if TERRAFORM_OCI_REGION_BOM - default "ca-montreal-1" if TERRAFORM_OCI_REGION_YUL - default "ca-toronto-1" if TERRAFORM_OCI_REGION_YYZ - default "us-ashburn-1" if TERRAFORM_OCI_REGION_IAD - default "us-chicago-1" if TERRAFORM_OCI_REGION_ORD - default "us-phoenix-1" if TERRAFORM_OCI_REGION_PHX - default "us-sanjose-1" if TERRAFORM_OCI_REGION_SJC - -config TERRAFORM_OCI_AVAILABLITY_DOMAIN - string "OCI availablity domain" - help - The name of the availability domain. - Read this: - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm +source "terraform/oci/kconfigs/regions/Kconfig.ap-hyderabad-1" +source "terraform/oci/kconfigs/regions/Kconfig.ap-mumbai-1" +source "terraform/oci/kconfigs/regions/Kconfig.ca-montreal-1" +source "terraform/oci/kconfigs/regions/Kconfig.ca-toronto-1" +source "terraform/oci/kconfigs/regions/Kconfig.us-ashburn-1" +source "terraform/oci/kconfigs/regions/Kconfig.us-chicago-1" +source "terraform/oci/kconfigs/regions/Kconfig.us-phoenix-1" +source "terraform/oci/kconfigs/regions/Kconfig.us-sanjose-1" config TERRAFORM_OCI_COMPARTMENT_OCID string "OCI compartment OCID" diff --git a/terraform/oci/kconfigs/regions/Kconfig.ap-hyderabad-1 b/terraform/oci/kconfigs/regions/Kconfig.ap-hyderabad-1 new file mode 100644 index 000000000000..f4ac37ef38da --- /dev/null +++ b/terraform/oci/kconfigs/regions/Kconfig.ap-hyderabad-1 @@ -0,0 +1,28 @@ +if TERRAFORM_OCI_REGION_HYD + +config TERRAFORM_OCI_REGION + string + output yaml + default "ap-hyderabad-1" + +choice + prompt "Availability Domain" + default TERRAFORM_OCI_REGION_HYD_AD1 + help + The number of the Availability Domain. This number + corresponds to the integer at the end of the Availability + Domain name. + + The OCI Fault Domain is chosen automatically. + +config TERRAFORM_OCI_REGION_HYD_AD1 + bool "1" + +endchoice + +config TERRAFORM_OCI_AD_NUMBER + int + output yaml + default 1 if TERRAFORM_OCI_REGION_HYD_1_AD1 + +endif # TERRAFORM_OCI_REGION_HYD_1 diff --git a/terraform/oci/kconfigs/regions/Kconfig.ap-mumbai-1 b/terraform/oci/kconfigs/regions/Kconfig.ap-mumbai-1 new file mode 100644 index 000000000000..f05b595c3993 --- /dev/null +++ b/terraform/oci/kconfigs/regions/Kconfig.ap-mumbai-1 @@ -0,0 +1,27 @@ +if TERRAFORM_OCI_REGION_BOM + +config TERRAFORM_OCI_REGION + string + output yaml + default "ap-mumbai-1" +choice + prompt "Availability Domain" + default TERRAFORM_OCI_REGION_BOM_AD1 + help + The number of the Availability Domain. This number + corresponds to the integer at the end of the Availability + Domain name. + + The OCI Fault Domain is chosen automatically. + +config TERRAFORM_OCI_REGION_BOM_AD1 + bool "1" + +endchoice + +config TERRAFORM_OCI_AD_NUMBER + int + output yaml + default 1 if TERRAFORM_OCI_REGION_BOM_AD1 + +endif # TERRAFORM_OCI_REGION_BOM diff --git a/terraform/oci/kconfigs/regions/Kconfig.ca-montreal-1 b/terraform/oci/kconfigs/regions/Kconfig.ca-montreal-1 new file mode 100644 index 000000000000..ce71f531e488 --- /dev/null +++ b/terraform/oci/kconfigs/regions/Kconfig.ca-montreal-1 @@ -0,0 +1,28 @@ +if TERRAFORM_OCI_REGION_YUL + +config TERRAFORM_OCI_REGION + string + output yaml + default "ca-montreal-1" + +choice + prompt "Availability Domain" + default TERRAFORM_OCI_REGION_YUL_AD1 + help + The number of the Availability Domain. This number + corresponds to the integer at the end of the Availability + Domain name. + + The OCI Fault Domain is chosen automatically. + +config TERRAFORM_OCI_REGION_YUL_AD1 + bool "1" + +endchoice + +config TERRAFORM_OCI_AD_NUMBER + int + output yaml + default 1 if TERRAFORM_OCI_REGION_YUL_AD1 + +endif # TERRAFORM_OCI_REGION_YUL diff --git a/terraform/oci/kconfigs/regions/Kconfig.ca-toronto-1 b/terraform/oci/kconfigs/regions/Kconfig.ca-toronto-1 new file mode 100644 index 000000000000..16053e94e983 --- /dev/null +++ b/terraform/oci/kconfigs/regions/Kconfig.ca-toronto-1 @@ -0,0 +1,28 @@ +if TERRAFORM_OCI_REGION_YYZ + +config TERRAFORM_OCI_REGION + string + output yaml + default "ca-toronto-1" + +choice + prompt "Availability Domain" + default TERRAFORM_OCI_REGION_YYZ_AD1 + help + The number of the Availability Domain. This number + corresponds to the integer at the end of the Availability + Domain name. + + The OCI Fault Domain is chosen automatically. + +config TERRAFORM_OCI_REGION_YYZ_AD1 + bool "1" + +endchoice + +config TERRAFORM_OCI_AD_NUMBER + int + output yaml + default 1 if TERRAFORM_OCI_REGION_YYZ_AD1 + +endif # TERRAFORM_OCI_REGION_YYZ diff --git a/terraform/oci/kconfigs/regions/Kconfig.us-ashburn-1 b/terraform/oci/kconfigs/regions/Kconfig.us-ashburn-1 new file mode 100644 index 000000000000..9aa4d2714452 --- /dev/null +++ b/terraform/oci/kconfigs/regions/Kconfig.us-ashburn-1 @@ -0,0 +1,36 @@ +if TERRAFORM_OCI_REGION_IAD + +config TERRAFORM_OCI_REGION + string + output yaml + default "us-ashburn-1" + +choice + prompt "Availability Domain" + default TERRAFORM_OCI_REGION_IAD_AD1 + help + The number of the Availability Domain. This number + corresponds to the integer at the end of the Availability + Domain name. + + The OCI Fault Domain is chosen automatically. + +config TERRAFORM_OCI_REGION_IAD_AD1 + bool "1" + +config TERRAFORM_OCI_REGION_IAD_AD2 + bool "2" + +config TERRAFORM_OCI_REGION_IAD_AD3 + bool "3" + +endchoice + +config TERRAFORM_OCI_AD_NUMBER + int + output yaml + default 1 if TERRAFORM_OCI_REGION_IAD_AD1 + default 2 if TERRAFORM_OCI_REGION_IAD_AD2 + default 3 if TERRAFORM_OCI_REGION_IAD_AD3 + +endif # TERRAFORM_OCI_REGION_IAD diff --git a/terraform/oci/kconfigs/regions/Kconfig.us-chicago-1 b/terraform/oci/kconfigs/regions/Kconfig.us-chicago-1 new file mode 100644 index 000000000000..19c3b50c2772 --- /dev/null +++ b/terraform/oci/kconfigs/regions/Kconfig.us-chicago-1 @@ -0,0 +1,36 @@ +if TERRAFORM_OCI_REGION_ORD + +config TERRAFORM_OCI_REGION + string + output yaml + default "us-chicago-1" + +choice + prompt "Availability Domain" + default TERRAFORM_OCI_REGION_ORD_AD1 + help + The number of the Availability Domain. This number + corresponds to the integer at the end of the Availability + Domain name. + + The OCI Fault Domain is chosen automatically. + +config TERRAFORM_OCI_REGION_ORD_AD1 + bool "1" + +config TERRAFORM_OCI_REGION_ORD_AD2 + bool "2" + +config TERRAFORM_OCI_REGION_ORD_AD3 + bool "3" + +endchoice + +config TERRAFORM_OCI_AD_NUMBER + int + output yaml + default 1 if TERRAFORM_OCI_REGION_ORD_AD1 + default 2 if TERRAFORM_OCI_REGION_ORD_AD2 + default 3 if TERRAFORM_OCI_REGION_ORD_AD3 + +endif # TERRAFORM_OCI_REGION_ORD diff --git a/terraform/oci/kconfigs/regions/Kconfig.us-phoenix-1 b/terraform/oci/kconfigs/regions/Kconfig.us-phoenix-1 new file mode 100644 index 000000000000..eb8021191ba3 --- /dev/null +++ b/terraform/oci/kconfigs/regions/Kconfig.us-phoenix-1 @@ -0,0 +1,36 @@ +if TERRAFORM_OCI_REGION_PHX + +config TERRAFORM_OCI_REGION + string + output yaml + default "us-phoenix-1" + +choice + prompt "Availability Domain" + default TERRAFORM_OCI_REGION_PHX_AD1 + help + The number of the Availability Domain. This number + corresponds to the integer at the end of the Availability + Domain name. + + The OCI Fault Domain is chosen automatically. + +config TERRAFORM_OCI_REGION_PHX_AD1 + bool "1" + +config TERRAFORM_OCI_REGION_PHX_AD2 + bool "2" + +config TERRAFORM_OCI_REGION_PHX_AD3 + bool "3" + +endchoice + +config TERRAFORM_OCI_AD_NUMBER + int + output yaml + default 1 if TERRAFORM_OCI_REGION_PHX_AD1 + default 2 if TERRAFORM_OCI_REGION_PHX_AD2 + default 3 if TERRAFORM_OCI_REGION_PHX_AD3 + +endif # TERRAFORM_OCI_REGION_PHX diff --git a/terraform/oci/kconfigs/regions/Kconfig.us-sanjose-1 b/terraform/oci/kconfigs/regions/Kconfig.us-sanjose-1 new file mode 100644 index 000000000000..69b4035f2b9b --- /dev/null +++ b/terraform/oci/kconfigs/regions/Kconfig.us-sanjose-1 @@ -0,0 +1,28 @@ +if TERRAFORM_OCI_REGION_SJC + +config TERRAFORM_OCI_REGION + string + output yaml + default "us-sanjose-1" + +choice + prompt "Availability Domain" + default TERRAFORM_OCI_REGION_SJC_AD1 + help + The number of the Availability Domain. This number + corresponds to the integer at the end of the Availability + Domain name. + + The OCI Fault Domain is chosen automatically. + +config TERRAFORM_OCI_REGION_SJC_AD1 + bool "1" + +endchoice + +config TERRAFORM_OCI_AD_NUMBER + int + output yaml + default 1 if TERRAFORM_OCI_REGION_SJC_AD1 + +endif # TERRAFORM_OCI_REGION_SJC diff --git a/terraform/oci/main.tf b/terraform/oci/main.tf index c96e050b36e2..5520fdbed517 100644 --- a/terraform/oci/main.tf +++ b/terraform/oci/main.tf @@ -1,7 +1,12 @@ +data "oci_identity_availability_domain" "kdevops_av_domain" { + ad_number = var.oci_ad_number + compartment_id = var.oci_tenancy_ocid +} + resource "oci_core_instance" "kdevops_instance" { count = local.kdevops_num_boxes - availability_domain = var.oci_availablity_domain + availability_domain = data.oci_identity_availability_domain.kdevops_av_domain.name compartment_id = var.oci_compartment_ocid shape = var.oci_shape shape_config { @@ -30,9 +35,8 @@ resource "oci_core_instance" "kdevops_instance" { resource "oci_core_volume" "kdevops_data_disk" { count = var.oci_volumes_enable_extra == "true" ? 0 : local.kdevops_num_boxes + availability_domain = data.oci_identity_availability_domain.kdevops_av_domain.name compartment_id = var.oci_compartment_ocid - - availability_domain = var.oci_availablity_domain display_name = var.oci_data_volume_display_name size_in_gbs = 50 } @@ -40,9 +44,8 @@ resource "oci_core_volume" "kdevops_data_disk" { resource "oci_core_volume" "kdevops_sparse_disk" { count = var.oci_volumes_enable_extra == "true" ? 0 : local.kdevops_num_boxes + availability_domain = data.oci_identity_availability_domain.kdevops_av_domain.name compartment_id = var.oci_compartment_ocid - - availability_domain = var.oci_availablity_domain display_name = var.oci_sparse_volume_display_name size_in_gbs = 120 } @@ -71,7 +74,7 @@ module "volumes" { count = var.oci_volumes_enable_extra == "true" ? local.kdevops_num_boxes : 0 source = "./volumes" - vol_availability_domain = var.oci_availablity_domain + vol_availability_domain = data.oci_identity_availability_domain.kdevops_av_domain.name vol_compartment_ocid = var.oci_compartment_ocid vol_instance_id = element(oci_core_instance.kdevops_instance.*.id, count.index) vol_instance_name = element(var.kdevops_nodes, count.index) diff --git a/terraform/oci/vars.tf b/terraform/oci/vars.tf index 4c6383d9b231..05c3f3769e94 100644 --- a/terraform/oci/vars.tf +++ b/terraform/oci/vars.tf @@ -1,3 +1,8 @@ +variable "oci_ad_number" { + description = "Suffix number of availability domain" + type = number +} + variable "oci_region" { description = "An OCI region" type = string @@ -23,11 +28,6 @@ variable "oci_user_fingerprint" { type = string } -variable "oci_availablity_domain" { - description = "Name of availability domain" - type = string -} - variable "oci_compartment_ocid" { description = "OCID of compartment" type = string From patchwork Tue Apr 1 00:59:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034263 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 5A2393C3C for ; Tue, 1 Apr 2025 01:00:15 +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=1743469216; cv=none; b=JdYXGw4odAavFz8f0VYHhH/Vf3B+jJbhuKnDf2KEimmURTcKSUAgCkp7ZoWnaCXpf1L5hL8PbpcCgwqofHMdqDy7aXkcgcWHL3iSRU4Ore1SSzXsTavuDM7uPW3iIk3iNOPp9M7+d29bWX9EkfRYjP9IrZv+hbvbJEnAFIQ1mNQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469216; c=relaxed/simple; bh=/iMVqgvzS2P0/8744cRcjOpp3/smKm7ZfThWLtgmGNg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=O1w50BIZ4J0RhVgOM0M3G9PK7hevcgwaeZMA0Uzya7YssT4li20zsGdEvV+Wk6MvSE+UozXNdsDH5rJ2cp/qFoxDmPF8xBQby1dGYAjA8oVXeH24BWqM25wtiSitw79pSU2C62FYT6rZTIO3K2N1s/p29Sng+FjuJabZi1G7PW4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TK/bCS6u; 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="TK/bCS6u" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7A84DC4CEE3; Tue, 1 Apr 2025 01:00:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469215; bh=/iMVqgvzS2P0/8744cRcjOpp3/smKm7ZfThWLtgmGNg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TK/bCS6uZ+dy921zD1ZhMFX/nDcvyk2lzV6XIBcR2wty4TWq5k1LpVaNwL9lP1mk1 sDXlWrQfucW4TmocZLDDFyrB3EFfleAV4IAnzMbfdP9yYjwv4MMuegCmqbaz0zSGAS uYbZ2l3XfCC8/itXuXKH9cgaCs6kdxRQjFnVdq64GV/sC/mt4GHZFAn20bi5rNTYRZ jYg7szBb2cvLvcPzqO15FkQxkt21d/TTEFexTCGMdzyS90tKUqIgUQy+UfUimAu/RR Dv86+PmnHvAsyhZlmiwKKsBB+2b36cKE7i9YvsZc3L5Gq4es/RriQd4zi+KvIYu6e6 DyR4MnvMG4Y1g== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 14/31] terraform/OCI: Select your compartment by name instead of by OCID Date: Mon, 31 Mar 2025 20:59:43 -0400 Message-ID: <20250401010000.764234-15-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 Terraform provides a data source that can map a human-readable compartment name to an OCID. This avoids the need to copy and paste the compartment OCID blob from the OCI cloud console. Just use the human-readable compartment name. Signed-off-by: Chuck Lever --- .../templates/oci/terraform.tfvars.j2 | 2 +- scripts/terraform.Makefile | 1 - terraform/oci/kconfigs/Kconfig.location | 9 ++++----- terraform/oci/main.tf | 18 +++++++++++++----- terraform/oci/vars.tf | 10 +++++----- 5 files changed, 23 insertions(+), 17 deletions(-) diff --git a/playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2 b/playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2 index 864d5d5a89f0..be0c154802ff 100644 --- a/playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2 +++ b/playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2 @@ -4,7 +4,7 @@ oci_user_ocid = "{{ terraform_oci_user_ocid }}" oci_user_private_key_path = "{{ terraform_oci_user_private_key_path }}" oci_user_fingerprint = "{{ terraform_oci_user_fingerprint }}" oci_ad_number = {{ terraform_oci_ad_number }} -oci_compartment_ocid = "{{ terraform_oci_compartment_ocid }}" +oci_compartment_name = "{{ terraform_oci_compartment_name }}" oci_shape = "{{ terraform_oci_shape }}" oci_instance_flex_ocpus = {{ terraform_oci_instance_flex_ocpus }} oci_instance_flex_memory_in_gbs = {{ terraform_oci_instance_flex_memory_in_gbs }} diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile index 0aca0b508086..02db2569ee08 100644 --- a/scripts/terraform.Makefile +++ b/scripts/terraform.Makefile @@ -95,7 +95,6 @@ TERRAFORM_EXTRA_VARS += terraform_gce_credentials=$(subst ",,$(CONFIG_TERRAFORM_ endif ifeq (y,$(CONFIG_TERRAFORM_OCI)) -TERRAFORM_EXTRA_VARS += terraform_oci_compartment_ocid=$(subst ",,$(CONFIG_TERRAFORM_OCI_COMPARTMENT_OCID)) TERRAFORM_EXTRA_VARS += terraform_oci_shape=$(subst ",,$(CONFIG_TERRAFORM_OCI_SHAPE)) TERRAFORM_EXTRA_VARS += terraform_oci_instance_flex_ocpus=$(subst ",,$(CONFIG_TERRAFORM_OCI_INSTANCE_FLEX_OCPUS)) TERRAFORM_EXTRA_VARS += terraform_oci_instance_flex_memory_in_gbs=$(subst ",,$(CONFIG_TERRAFORM_OCI_INSTANCE_FLEX_MEMORY_IN_GBS)) diff --git a/terraform/oci/kconfigs/Kconfig.location b/terraform/oci/kconfigs/Kconfig.location index 7bf5ae49ba03..eff58202f8c7 100644 --- a/terraform/oci/kconfigs/Kconfig.location +++ b/terraform/oci/kconfigs/Kconfig.location @@ -45,9 +45,8 @@ source "terraform/oci/kconfigs/regions/Kconfig.us-chicago-1" source "terraform/oci/kconfigs/regions/Kconfig.us-phoenix-1" source "terraform/oci/kconfigs/regions/Kconfig.us-sanjose-1" -config TERRAFORM_OCI_COMPARTMENT_OCID - string "OCI compartment OCID" +config TERRAFORM_OCI_COMPARTMENT_NAME + string "OCI compartment name" + output yaml help - The OCI ID of user's compartment. - Read this: - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm + The compartment name where your instances are to be created. diff --git a/terraform/oci/main.tf b/terraform/oci/main.tf index 5520fdbed517..6991644d83b8 100644 --- a/terraform/oci/main.tf +++ b/terraform/oci/main.tf @@ -1,3 +1,11 @@ +data "oci_identity_compartments" "kdevops_compartment" { + access_level = "ANY" + compartment_id = var.oci_tenancy_ocid + compartment_id_in_subtree = true + name = var.oci_compartment_name + state = "ACTIVE" +} + data "oci_identity_availability_domain" "kdevops_av_domain" { ad_number = var.oci_ad_number compartment_id = var.oci_tenancy_ocid @@ -7,8 +15,8 @@ resource "oci_core_instance" "kdevops_instance" { count = local.kdevops_num_boxes availability_domain = data.oci_identity_availability_domain.kdevops_av_domain.name - compartment_id = var.oci_compartment_ocid - shape = var.oci_shape + compartment_id = data.oci_identity_compartments.kdevops_compartment.compartments[0].id + shape = var.oci_shape shape_config { memory_in_gbs = var.oci_instance_flex_memory_in_gbs ocpus = var.oci_instance_flex_ocpus @@ -36,7 +44,7 @@ resource "oci_core_volume" "kdevops_data_disk" { count = var.oci_volumes_enable_extra == "true" ? 0 : local.kdevops_num_boxes availability_domain = data.oci_identity_availability_domain.kdevops_av_domain.name - compartment_id = var.oci_compartment_ocid + compartment_id = data.oci_identity_compartments.kdevops_compartment.compartments[0].id display_name = var.oci_data_volume_display_name size_in_gbs = 50 } @@ -45,7 +53,7 @@ resource "oci_core_volume" "kdevops_sparse_disk" { count = var.oci_volumes_enable_extra == "true" ? 0 : local.kdevops_num_boxes availability_domain = data.oci_identity_availability_domain.kdevops_av_domain.name - compartment_id = var.oci_compartment_ocid + compartment_id = data.oci_identity_compartments.kdevops_compartment.compartments[0].id display_name = var.oci_sparse_volume_display_name size_in_gbs = 120 } @@ -75,7 +83,7 @@ module "volumes" { source = "./volumes" vol_availability_domain = data.oci_identity_availability_domain.kdevops_av_domain.name - vol_compartment_ocid = var.oci_compartment_ocid + vol_compartment_ocid = data.oci_identity_compartments.kdevops_compartment.compartments[0].id vol_instance_id = element(oci_core_instance.kdevops_instance.*.id, count.index) vol_instance_name = element(var.kdevops_nodes, count.index) vol_volume_count = var.oci_volumes_per_instance diff --git a/terraform/oci/vars.tf b/terraform/oci/vars.tf index 05c3f3769e94..f760fbb776fa 100644 --- a/terraform/oci/vars.tf +++ b/terraform/oci/vars.tf @@ -3,6 +3,11 @@ variable "oci_ad_number" { type = number } +variable "oci_compartment_name" { + description = "Name of compartment in which to create resources" + type = string +} + variable "oci_region" { description = "An OCI region" type = string @@ -28,11 +33,6 @@ variable "oci_user_fingerprint" { type = string } -variable "oci_compartment_ocid" { - description = "OCID of compartment" - type = string -} - variable "oci_shape" { description = "Shape name" type = string From patchwork Tue Apr 1 00:59:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034264 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 9221824B29 for ; Tue, 1 Apr 2025 01:00:16 +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=1743469216; cv=none; b=s0MmIN0GsqntHX3rSIDufFx0kcxSZy0gpJZquQ8f5arnwl3GHZFCmqbaI/vFGsnY6SySKWWoMxHe3xWt2dI8hB0Wi5m6GUPTt0Mg6Z+kJ7S2UGiN74c3qvb/sl7qw/YUQe7nyKgGVMzW7C+Z1ol5solRNTAYUHI8fnpn+fZpvFg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469216; c=relaxed/simple; bh=r5/1sdPKBNJXdGTUoJ0H0pioi9ov5ncDp+//b0gl8q4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rgFUKFW5Y89DX7by4lhsKF+1WBWR+NciXQSbqIIcHfJCOF8NGMDNtA94gLwx83yFQljpuAxNp95UF5nncV7BRHiDOMDeuV8bOlBZ/bYWx28Us/VskJlUOKWXWReSHOOguadLMc+ERgDIbXP6jIdom7SGT1o2YffOrK6jzQm048I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OJEYSelf; 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="OJEYSelf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 18C17C4CEEA; Tue, 1 Apr 2025 01:00:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469216; bh=r5/1sdPKBNJXdGTUoJ0H0pioi9ov5ncDp+//b0gl8q4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OJEYSelfi9RDJmpRqn1fmK7HVOybU6aWx0lK1ORyN4BuxAKcOfA6CIFtJYOHaO7eY TmGW/qxs6w3FGo4o7Wlkd6OMEIUfZlRuOeyDlQQFJc0I3HoF+u/h/4nt0r8nvqiw/E pOKS596Uf0k2Pe51k3Dob47PDqiBh7NDGi+e/viuI6uFUy0pSxxIv3qmY3KStwfp2R j6F0Z7el2KdkjvmZvOCWE59JGPDXJDshvIFWCWQ112uyDoY+VE6YcHaK35EpDlJEV7 TGgXYsY72DN4TRTC/Zb5NpsiDyu9/YRR3ws2qi84KYxsokVNMAcaznL+neLt0HkPuD tXmaNf7h6Sf9A== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 15/31] terraform/OCI: Use "output yaml" for the instance shape setting Date: Mon, 31 Mar 2025 20:59:44 -0400 Message-ID: <20250401010000.764234-16-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 Refactor: Remove the line in terraform.Makefile that sets "terraform_oci_shape" and just pass it directly from Kconfig via an "output yaml" directive. Signed-off-by: Chuck Lever --- scripts/terraform.Makefile | 1 - terraform/oci/kconfigs/Kconfig.compute | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile index 02db2569ee08..a1f510a33536 100644 --- a/scripts/terraform.Makefile +++ b/scripts/terraform.Makefile @@ -95,7 +95,6 @@ TERRAFORM_EXTRA_VARS += terraform_gce_credentials=$(subst ",,$(CONFIG_TERRAFORM_ endif ifeq (y,$(CONFIG_TERRAFORM_OCI)) -TERRAFORM_EXTRA_VARS += terraform_oci_shape=$(subst ",,$(CONFIG_TERRAFORM_OCI_SHAPE)) TERRAFORM_EXTRA_VARS += terraform_oci_instance_flex_ocpus=$(subst ",,$(CONFIG_TERRAFORM_OCI_INSTANCE_FLEX_OCPUS)) TERRAFORM_EXTRA_VARS += terraform_oci_instance_flex_memory_in_gbs=$(subst ",,$(CONFIG_TERRAFORM_OCI_INSTANCE_FLEX_MEMORY_IN_GBS)) TERRAFORM_EXTRA_VARS += terraform_oci_os_image_ocid=$(subst ",,$(CONFIG_TERRAFORM_OCI_OS_IMAGE_OCID)) diff --git a/terraform/oci/kconfigs/Kconfig.compute b/terraform/oci/kconfigs/Kconfig.compute index b794ef2d5190..c9e125dcf37a 100644 --- a/terraform/oci/kconfigs/Kconfig.compute +++ b/terraform/oci/kconfigs/Kconfig.compute @@ -1,5 +1,6 @@ config TERRAFORM_OCI_SHAPE string "OCI shape name" + output yaml help The name of the shape Read this: From patchwork Tue Apr 1 00:59:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034265 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 2BA4F24B29 for ; Tue, 1 Apr 2025 01:00:17 +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=1743469217; cv=none; b=TQOag4A1MZmXXbaaGLGbZonL7DGYKUJS6JfVWzYyPBNGHR6FyoG5atuprBJy3HCj75IGX4qxqYkimIpxJLyNszVCOYPZRyE8FHgXGheJSxxs9qxiO24QX8w4xu1y166jcwtq3ukOj70+vU6jXYATI8aE46Xi0BWWDAJSE5850RQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469217; c=relaxed/simple; bh=5FeGc9SJyAiv6rrC9LQD2FCz6F5028djlFVuLQQA32U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZE6wRSm6Oa3RVAuvrbH2IMkuJ+qlmywCdlEOp2Rhr4F/ObNTU3vYaoLPmKU+kyRL1XBA3JTuKyL5oKti+F6n97WoKVDMWMRwdiY6/7qINket8kGU/vlijyeCgMj8813YQtFwlOX5Dfw7XN4+cwaiBsn07I0Cn7Wq4xWc59N7pxQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CvfmoU/Z; 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="CvfmoU/Z" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AD3CAC4CEE3; Tue, 1 Apr 2025 01:00:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469217; bh=5FeGc9SJyAiv6rrC9LQD2FCz6F5028djlFVuLQQA32U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CvfmoU/Z9Mx03Z1GEIr+M/i8Kl2iK+QLortnEiV3Ww4rSSnEx4PKqUseeDK/LC19R 3P1vkbNh7vk0nTz2gYrh48AMI7/luLNZlyssf2h3eRml5BNxSxL8yILScsnYC+vvIe yZREGCkoLQsjalDcwHC7TmpATZSSm0jZLyMY1T9z+h7S2YDsdbiY3lweemzzAbcNwN Gx0nauX+wmy7pD1AmdhhtyQFHtWW78nW3Gfxeg3mqxHBplK9wNetZbPNNjG9YKtfp8 sWa1rMBAb9TodEs2xEE5SVmvBHnteaTplHGAYMnCeidc26XnG+9W2Q111de65LHvsC DhqDOvpNVqADw== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 16/31] terraform/OCI: Add a shape selector for Flex shapes Date: Mon, 31 Mar 2025 20:59:45 -0400 Message-ID: <20250401010000.764234-17-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 It's easier for users to select from a menu of choices rather than to enter a free-form string. The selector is moved to a separate file to make it straightforward to update (either by a human or a script). Signed-off-by: Chuck Lever --- terraform/oci/kconfigs/Kconfig.compute | 20 +---- terraform/oci/kconfigs/shapes/Kconfig.flex | 85 ++++++++++++++++++++++ 2 files changed, 86 insertions(+), 19 deletions(-) create mode 100644 terraform/oci/kconfigs/shapes/Kconfig.flex diff --git a/terraform/oci/kconfigs/Kconfig.compute b/terraform/oci/kconfigs/Kconfig.compute index c9e125dcf37a..dc6427d18f42 100644 --- a/terraform/oci/kconfigs/Kconfig.compute +++ b/terraform/oci/kconfigs/Kconfig.compute @@ -1,22 +1,4 @@ -config TERRAFORM_OCI_SHAPE - string "OCI shape name" - output yaml - help - The name of the shape - Read this: - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm - -config TERRAFORM_OCI_INSTANCE_FLEX_OCPUS - int "Number of flexiable instance OCPUs" - default 2 - help - The number of OCPUs to use per flexible instance. - -config TERRAFORM_OCI_INSTANCE_FLEX_MEMORY_IN_GBS - int "How much RAM to use per flexible instance in GB" - default 4 - help - How much GiB of RAM to use per flexible instance. +source "terraform/oci/kconfigs/shapes/Kconfig.flex" config TERRAFORM_OCI_OS_IMAGE_OCID string "OCI OS image OCID" diff --git a/terraform/oci/kconfigs/shapes/Kconfig.flex b/terraform/oci/kconfigs/shapes/Kconfig.flex new file mode 100644 index 000000000000..80ebccc59d6a --- /dev/null +++ b/terraform/oci/kconfigs/shapes/Kconfig.flex @@ -0,0 +1,85 @@ +choice + prompt "OCI shape" + default TERRAFORM_OCI_SHAPE_VM_STANDARD3_FLEX + help + Select the basic hardware capabilities that are in each + instance. For more detail, see: + + https://docs.oracle.com/en-us/iaas/Content/Compute/References/computeshapes.htm#flexible + +config TERRAFORM_OCI_SHAPE_VM_STANDARD3_FLEX + bool "VM.Standard3.Flex" + depends on TARGET_ARCH_X86_64 + help + Selecting this option provisions each guest with between 1 + and 32 OCPUs (physical cores) and up to 512MB of memory. + +config TERRAFORM_OCI_SHAPE_VM_STANDARD_E4_FLEX + bool "VM.Standard.E4.Flex" + depends on TARGET_ARCH_X86_64 + help + Selecting this option provisions each guest with between 1 + and 114 OCPUs (physical AMD cores) and up to 1760MB of memory. + +config TERRAFORM_OCI_SHAPE_VM_STANDARD_E5_FLEX + bool "VM.Standard.E5.Flex" + depends on TARGET_ARCH_X86_64 + help + Selecting this option provisions each guest with between 1 + and 94 OCPUs (physical AMD cores) and up to 1048MB of memory. + +config TERRAFORM_OCI_SHAPE_VM_STANDARD_A1_FLEX + bool "VM.Standard.A1.Flex" + depends on TARGET_ARCH_ARM64 + help + Selecting this option provisions each guest with between 1 + and 80 OCPUs (physical ARM cores) and up to 512MB of memory. + +config TERRAFORM_OCI_SHAPE_VM_STANDARD_A2_FLEX + bool "VM.Standard.A2.Flex" + depends on TARGET_ARCH_ARM64 + help + Selecting this option provisions each guest with between 1 + and 78 OCPUs (physical ARM cores) and up to 946MB of memory. + +config TERRAFORM_OCI_SHAPE_VM_DENSEIO_E4_FLEX + bool "VM.DenseIO.E4.Flex" + depends on TARGET_ARCH_X86_64 + help + Selecting this option provisions each instance with either + 8 OCPUs and 128 GB memory, 16 OCPUs and 256 GB memory, or + 32 OCPUs and 512 GB memory. CPUs are based on the AMD + x86_64 platform. + +config TERRAFORM_OCI_SHAPE_VM_OPTIMIZED3_FLEX + bool "VM.Optimized3.Flex" + depends on TARGET_ARCH_X86_64 + help + Selecting this option provisions each instance with up to + 18 OCPUS. The memory provisioned for each instance is + typically matches a multiple of the number of OCPUS. + +endchoice + +config TERRAFORM_OCI_SHAPE + string + output yaml + default "VM.Standard3.Flex" if TERRAFORM_OCI_SHAPE_VM_STANDARD3_FLEX + default "VM.Standard.E4.Flex" if TERRAFORM_OCI_SHAPE_VM_STANDARD_E4_FLEX + default "VM.Standard.E5.Flex" if TERRAFORM_OCI_SHAPE_VM_STANDARD_E5_FLEX + default "VM.Standard.A1.Flex" if TERRAFORM_OCI_SHAPE_VM_STANDARD_A1_FLEX + default "VM.Standard.A2.Flex" if TERRAFORM_OCI_SHAPE_VM_STANDARD_A2_FLEX + default "VM.DenseIO.E4.Flex" if TERRAFORM_OCI_SHAPE_VM_DENSEIO_E4_FLEX + default "VM.Optimized3.Flex" if TERRAFORM_OCI_SHAPE_VM_OPTIMIZED3_FLEX + +config TERRAFORM_OCI_INSTANCE_FLEX_OCPUS + int "Number of flexible instance OCPUs" + default 2 + help + The number of OCPUs to use per flexible instance. + +config TERRAFORM_OCI_INSTANCE_FLEX_MEMORY_IN_GBS + int "How much RAM to use per flexible instance in GB" + default 4 + help + How much GiB of RAM to use per flexible instance. From patchwork Tue Apr 1 00:59:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034266 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 31A915234 for ; Tue, 1 Apr 2025 01:00:17 +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=1743469218; cv=none; b=G0ffkLK0GTWQOsj50F36jVdcsjW4ORSIkSDL4WqEFDsKMkJweh+qSDW38y7ivLzC9/qbfx9zznBLosS0BFZC39pPGySsYJCkRPMFDuCNYXnDGAZOQ/QmQdMas7BoSNPIWJWICo0MQsLx1rhjcKNav+xMyds0l9ZplaNyYYXmrDQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469218; c=relaxed/simple; bh=/FZNx74x7FubHMKOu3j4wKaGpoOkRaTxjdqqhwt5kwQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fP3Pv/CKwXOR1Ooxgnzy1HGqkcZzLXorx9zMEz/nkXms5w5ypuijmCtoVzjS1PfrLmmzO25fvDYFCtD9Dwwhx48/7Jb91SSN1y38T1GzELU3jiCNnyaQsUBIriRqu2H5y2mSVujdzfmmI4uHNNpofyaAHvNtC5cGKNGNKyAeG38= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JDOyTgog; 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="JDOyTgog" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 48502C4CEE5; Tue, 1 Apr 2025 01:00:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469217; bh=/FZNx74x7FubHMKOu3j4wKaGpoOkRaTxjdqqhwt5kwQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JDOyTgogCg0oXtD/agNv/UlB4A8PPN5pRA79yZWATdV3VvEHcHysglk8o3J0Vcyxf uHi0loTV4F0ep1g1ztJRaPw2kIDVyqCxeoQvaOSisqig8w7pnjZq6pLhQ60Ta5Lwtl mzNjVIWKRsVUP1gQITgHVpIJZ1XTOlfaiqCkpN4yV9iPKiKPVIZOMiybvxm6G0mFFI FVj0vTxf1DsLtgp4ojWXv08J1rdATC8f9ef3TdZXST6XHtECSgTCLG/hxMRiq+CrSy ZuIIYh4E/hB34iroUin5qwOsWXmfaumre991ki1JG0gaLgIpYAH1XhFdcZO39Roq++ xifnpuZNRABrw== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 17/31] terraform/OCI: Use "output yaml" for the OCPUs setting Date: Mon, 31 Mar 2025 20:59:46 -0400 Message-ID: <20250401010000.764234-18-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 Refactor: Remove the line in terraform.Makefile that sets "terraform_oci_instance_flex_ocpus" and just pass it directly from Kconfig via an "output yaml" directive. As an additional clean up, update the help text. Signed-off-by: Chuck Lever --- scripts/terraform.Makefile | 1 - terraform/oci/kconfigs/shapes/Kconfig.flex | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile index a1f510a33536..8e4973930125 100644 --- a/scripts/terraform.Makefile +++ b/scripts/terraform.Makefile @@ -95,7 +95,6 @@ TERRAFORM_EXTRA_VARS += terraform_gce_credentials=$(subst ",,$(CONFIG_TERRAFORM_ endif ifeq (y,$(CONFIG_TERRAFORM_OCI)) -TERRAFORM_EXTRA_VARS += terraform_oci_instance_flex_ocpus=$(subst ",,$(CONFIG_TERRAFORM_OCI_INSTANCE_FLEX_OCPUS)) TERRAFORM_EXTRA_VARS += terraform_oci_instance_flex_memory_in_gbs=$(subst ",,$(CONFIG_TERRAFORM_OCI_INSTANCE_FLEX_MEMORY_IN_GBS)) TERRAFORM_EXTRA_VARS += terraform_oci_os_image_ocid=$(subst ",,$(CONFIG_TERRAFORM_OCI_OS_IMAGE_OCID)) ifeq (y, $(CONFIG_TERRAFORM_OCI_ASSIGN_PUBLIC_IP)) diff --git a/terraform/oci/kconfigs/shapes/Kconfig.flex b/terraform/oci/kconfigs/shapes/Kconfig.flex index 80ebccc59d6a..d37a498aacd9 100644 --- a/terraform/oci/kconfigs/shapes/Kconfig.flex +++ b/terraform/oci/kconfigs/shapes/Kconfig.flex @@ -73,10 +73,22 @@ config TERRAFORM_OCI_SHAPE default "VM.Optimized3.Flex" if TERRAFORM_OCI_SHAPE_VM_OPTIMIZED3_FLEX config TERRAFORM_OCI_INSTANCE_FLEX_OCPUS - int "Number of flexible instance OCPUs" + int "Instance CPU count" + output yaml default 2 help - The number of OCPUs to use per flexible instance. + The Oracle CPU (OCPU) represents physical CPU cores and is + the unit of measurement for CPUs on x86 CPUs (AMD and + Intel) and Arm CPUs (OCI Ampere Compute). A virtual CPU + (vCPU), the industry-standard for measuring compute + resources, represents one execution thread of a physical + CPU core. + + Most CPU architectures, including x86, runs two threads + per physical core, so one OCPU is the equal of two vCPUs + for x86-based compute. For OCI Compute, the minimum unit + of provisioning starts from one OCPU on both X86 (Intel + and AMD) and OCI Ampere Compute processors. config TERRAFORM_OCI_INSTANCE_FLEX_MEMORY_IN_GBS int "How much RAM to use per flexible instance in GB" From patchwork Tue Apr 1 00:59:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034267 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 5843924B29 for ; Tue, 1 Apr 2025 01:00:18 +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=1743469218; cv=none; b=ihPZ1TDj6vdQ0spiScvUwRVTI8MmFSubMtESWJxc2FZE01rga5AcTuogNBBy2fW/29bmN8luqJ7b+xgdNUv0Wxzs/y4YCIzZ7/Ek5P5+43j6flGt0TW/LXiLMMZ/NfpoxIjFdVs5z4DQZHsgRC61yBWzloAsBx3xtJZ6JAel5Fk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469218; c=relaxed/simple; bh=xO4IW81iBLE8NIHjDrKHPq3jrObzy4VT0n7b4e50qMw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BVMyqa/Y3EEbOGeYMF6hTD4gtXjeqt1bPwiCo8gi43C16fa2VWnOvwwqn+i4yf8LysxiIJ1e7MnCVbh26j2U1/OwHE5onGmzcKWpNlpMtbic3YZpCwKb8VuaCErA/cTvM9MS+QHe3dWmUB/UkEdsF09gQu3ftC7G/WG4p1L/xYc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=p0asLKli; 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="p0asLKli" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D8E42C4CEE3; Tue, 1 Apr 2025 01:00:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469218; bh=xO4IW81iBLE8NIHjDrKHPq3jrObzy4VT0n7b4e50qMw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p0asLKli9xCAe2S3bhH1j/iepitCo8Aluzx50Rvvad9tZq5jsf+lIMNTEs2ZHulzh w5hUjSBfthy4SBJVGB0N7rfIzE37id1JddZh5TPkrsNKH8wR3uc4/gcp5HSwnC2xt8 qauDkdDexw3V5C/H2PbyKHHAqsSql7Vw78zqd/bTRqs7X51AArc0xQqDRQGOmlvc/d EXhYjJ6ob7nfHVBafqUH9FBSIKHBjjPZbqnFCZxncRBxynBis5+t/1NQKtl6m40kXJ 1lJg0u1qM1KARKG1wSC+A5TW1gXp1TcjCrBaSdziau3QCPX/5k+sCLfQFe81y7FWQE IpUdMHMxmGHNA== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 18/31] terraform/OCI: Use "output yaml" for the memory_in_gbs setting Date: Mon, 31 Mar 2025 20:59:47 -0400 Message-ID: <20250401010000.764234-19-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 Refactor: Remove the line in terraform.Makefile that sets "terraform_oci_instance_flex_memory_in_gbs" and just pass it directly from Kconfig via an "output yaml" directive. As an additional clean up, update the help text. Signed-off-by: Chuck Lever --- scripts/terraform.Makefile | 1 - terraform/oci/kconfigs/shapes/Kconfig.flex | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile index 8e4973930125..2750b63b01c0 100644 --- a/scripts/terraform.Makefile +++ b/scripts/terraform.Makefile @@ -95,7 +95,6 @@ TERRAFORM_EXTRA_VARS += terraform_gce_credentials=$(subst ",,$(CONFIG_TERRAFORM_ endif ifeq (y,$(CONFIG_TERRAFORM_OCI)) -TERRAFORM_EXTRA_VARS += terraform_oci_instance_flex_memory_in_gbs=$(subst ",,$(CONFIG_TERRAFORM_OCI_INSTANCE_FLEX_MEMORY_IN_GBS)) TERRAFORM_EXTRA_VARS += terraform_oci_os_image_ocid=$(subst ",,$(CONFIG_TERRAFORM_OCI_OS_IMAGE_OCID)) ifeq (y, $(CONFIG_TERRAFORM_OCI_ASSIGN_PUBLIC_IP)) TERRAFORM_EXTRA_VARS += terraform_oci_assign_public_ip=true diff --git a/terraform/oci/kconfigs/shapes/Kconfig.flex b/terraform/oci/kconfigs/shapes/Kconfig.flex index d37a498aacd9..5ecccf400c6b 100644 --- a/terraform/oci/kconfigs/shapes/Kconfig.flex +++ b/terraform/oci/kconfigs/shapes/Kconfig.flex @@ -91,7 +91,10 @@ config TERRAFORM_OCI_INSTANCE_FLEX_OCPUS and AMD) and OCI Ampere Compute processors. config TERRAFORM_OCI_INSTANCE_FLEX_MEMORY_IN_GBS - int "How much RAM to use per flexible instance in GB" + int "Instance memory size" + output yaml default 4 help - How much GiB of RAM to use per flexible instance. + Memory per instance, in GiBs. The minimum value for this + setting is a multiple of the number of OCPUS in each + instance. From patchwork Tue Apr 1 00:59:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034268 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 E6B392E3371 for ; Tue, 1 Apr 2025 01:00:18 +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=1743469219; cv=none; b=CQ2I6hG8yrHy349kxl8purFw5jPVS/4139hfjcc/OrmtVY09XeFq5K4NSRODFyU2Y5BE28mo+0l9/VCtCXhjQkXCYXMxmf2LJfGDKg0fpbeRy1FvbAeJYIJUP8rgZDFJMyKQQ4HWgGxua5CK2T+G8Z45Zr0sGergj2Mh7DdUoJc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469219; c=relaxed/simple; bh=5PMBFZyLkQxrNWxUcg1dwOnN40JgpNRF9AZcibTEskk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=twT2nfQjGxvlqw7cH3uyI4xC7iG9Al8k0MUxXC5jJb2C30xHgV1kD+/1WRAVB4XZ9wbf5PMLaP65ozladaaK49sd0levrxYWqYdShlyN3n3/plvOqaJONryAA+sdkhAfe/c5EGYvps0Wfs8ECIuAp/4+foijbrM96ZhtHoxdtHk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OS4IMlRd; 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="OS4IMlRd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7242CC4AF09; Tue, 1 Apr 2025 01:00:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469218; bh=5PMBFZyLkQxrNWxUcg1dwOnN40JgpNRF9AZcibTEskk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OS4IMlRdOA5rT6giJUgrURo0HALiHVa71GVtuyOV8GBKIOT+tmG5sU68mnMHK2OaW fw+8lk9+J1lNtRkcJhr9h90xVMYV75gWzxOEyM7izYT0HOuEGp1Z4erJ+FS9K6Ero1 7COu4Ske+wFL8HQbZVGT/HRma/bjfvrp6+nKpWSDKaAP85YkuT6Icd27+JhZHYAFyn MXTMdrPhZSUhhjKmqJm7ZSbgVIidJKs7UUc03EFmoXHfx4/KnxdSLPHw3eFhvGXVVy DloUYfSHXdPFzTcw6zGgm6CU1vLfDL9Rpj1SyxpHX1zeKcP9JPhCmKsW2FfnHZy/gQ Bg/kjJr3abryw== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 19/31] terraform/OCI: Add a shape family selector Date: Mon, 31 Mar 2025 20:59:48 -0400 Message-ID: <20250401010000.764234-20-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 I'd like to add bare metal shapes too, but they seem to be in a separate family in the OCI documentation. Signed-off-by: Chuck Lever --- terraform/oci/kconfigs/Kconfig.compute | 23 ++++++++++++++++++++++ terraform/oci/kconfigs/shapes/Kconfig.flex | 4 ++++ 2 files changed, 27 insertions(+) diff --git a/terraform/oci/kconfigs/Kconfig.compute b/terraform/oci/kconfigs/Kconfig.compute index dc6427d18f42..281ef6d29c95 100644 --- a/terraform/oci/kconfigs/Kconfig.compute +++ b/terraform/oci/kconfigs/Kconfig.compute @@ -1,3 +1,26 @@ +choice + prompt "OCI shape family" + default TERRAFORM_OCI_SHAPE_FAMILY_FLEX + help + This option selects the class of virtual hardware (CPUs and + memory) to provision for each target node. Most CPU + architectures, including x86, run two threads per physical + core, so one OCPU is the equal of two vCPUs for x86-based + compute. + + Which shapes are available is limited by your subscription + and what hardware has been deployed in your selected region. + +config TERRAFORM_OCI_SHAPE_FAMILY_FLEX + bool "Flex shapes" + help + A flexible shape is a virtual machine that lets you + customize the number of OCPUs and the amount of memory + per instance. The network bandwidth and number of VNICs + scale proportionately with the number of OCPUs. + +endchoice + source "terraform/oci/kconfigs/shapes/Kconfig.flex" config TERRAFORM_OCI_OS_IMAGE_OCID diff --git a/terraform/oci/kconfigs/shapes/Kconfig.flex b/terraform/oci/kconfigs/shapes/Kconfig.flex index 5ecccf400c6b..67d50604bfcb 100644 --- a/terraform/oci/kconfigs/shapes/Kconfig.flex +++ b/terraform/oci/kconfigs/shapes/Kconfig.flex @@ -1,3 +1,5 @@ +if TERRAFORM_OCI_SHAPE_FAMILY_FLEX + choice prompt "OCI shape" default TERRAFORM_OCI_SHAPE_VM_STANDARD3_FLEX @@ -98,3 +100,5 @@ config TERRAFORM_OCI_INSTANCE_FLEX_MEMORY_IN_GBS Memory per instance, in GiBs. The minimum value for this setting is a multiple of the number of OCPUS in each instance. + +endif # TERRAFORM_OCI_SHAPE_FAMILY_FLEX From patchwork Tue Apr 1 00:59:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034269 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 88EF52E3371 for ; Tue, 1 Apr 2025 01:00:19 +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=1743469219; cv=none; b=KM+i2gz89vQFntn1ieO6AWD6o4nilq/FrzruHZeYtwTKpb3s8shvSWHSe9K9Y5EuLzoswdIMpxSHVoCjluze7u5yUhX/PKxnZJa6VPLbuAaTMiskTLCR6bVH//4wv0xcOwbopYeupxqkygxYDqhwQ+2H2fL9huM/UXflHgiqjNA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469219; c=relaxed/simple; bh=xDrxhRrG5UTNdQWxaPAPl/RqMcC246UqWIdFUPNKJ9U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QnF0ZZufCifM5OxcDnrbeBTEkRN/uJMBL7HQ6IBAx+mNSwVpipFN3KhPOSnSB2V1+6x70wqRNPgG4aJaTEBCyJJL1LHVfceDTz4kOSUicoFD4UQUVbwcuXfoGvxP0KU8rKSPWjubbbQ6+MRXQI4hWT51Fso5B8izpdUIzyteY6E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rBo89h/1; 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="rBo89h/1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0EC3CC4CEE5; Tue, 1 Apr 2025 01:00:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469219; bh=xDrxhRrG5UTNdQWxaPAPl/RqMcC246UqWIdFUPNKJ9U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rBo89h/1mhkGVSnOnC8/vIqVFAnPvVZqPcWpfpKOmGNvpHxrcumJHer8Rw3VqDGIy 72k035CmbBjaumyiKKcQe5U02/Gh5/Zwy2F0ziEjFcx0wAYkuU3UI8/ZIab7O8fJxp Qzne+yIxaRYw13uyOnHRRKnWX4C+mjJ2G036AO58CMOvLrlu9cSnoupqkWwO1AKFV0 YvK4uvVRYk0zADXijWhmVGwpnfM9ijSpySLLlxOVBHCRA5GURndggqP4P/FKMLlU14 kdnBmxvAhzQRQzQvkF7wBhZOw/NeVv+shqhDKE/ZlWDE/vPFGLZjGWmJF0/zdjwNxS 0wGunuaAQM6Kw== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 20/31] terraform/OCI: Add a bare metal shape selector Date: Mon, 31 Mar 2025 20:59:49 -0400 Message-ID: <20250401010000.764234-21-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 Match the same capability that is available for kdevops on AWS. Signed-off-by: Chuck Lever --- .../templates/oci/terraform.tfvars.j2 | 4 + terraform/oci/kconfigs/Kconfig.compute | 9 ++ terraform/oci/kconfigs/shapes/Kconfig.bm | 83 +++++++++++++++++++ 3 files changed, 96 insertions(+) create mode 100644 terraform/oci/kconfigs/shapes/Kconfig.bm diff --git a/playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2 b/playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2 index be0c154802ff..a747a4188e7b 100644 --- a/playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2 +++ b/playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2 @@ -6,8 +6,12 @@ oci_user_fingerprint = "{{ terraform_oci_user_fingerprint }}" oci_ad_number = {{ terraform_oci_ad_number }} oci_compartment_name = "{{ terraform_oci_compartment_name }}" oci_shape = "{{ terraform_oci_shape }}" +{% if terraform_oci_instance_flex_ocpus is defined %} oci_instance_flex_ocpus = {{ terraform_oci_instance_flex_ocpus }} +{% endif %} +{% if terraform_oci_instance_flex_memory_in_gbs is defined %} oci_instance_flex_memory_in_gbs = {{ terraform_oci_instance_flex_memory_in_gbs }} +{% endif %} oci_os_image_ocid = "{{ terraform_oci_os_image_ocid }}" oci_assign_public_ip = "{{ terraform_oci_assign_public_ip | lower }}" oci_subnet_ocid = "{{ terraform_oci_subnet_ocid }}" diff --git a/terraform/oci/kconfigs/Kconfig.compute b/terraform/oci/kconfigs/Kconfig.compute index 281ef6d29c95..0e3aac104175 100644 --- a/terraform/oci/kconfigs/Kconfig.compute +++ b/terraform/oci/kconfigs/Kconfig.compute @@ -19,9 +19,18 @@ config TERRAFORM_OCI_SHAPE_FAMILY_FLEX per instance. The network bandwidth and number of VNICs scale proportionately with the number of OCPUs. +config TERRAFORM_OCI_SHAPE_FAMILY_BARE_METAL + bool "Bare metal" + help + A bare metal shape is a whole physical machine without + virtualization. This gives deterministic performance + characteristics but is less configurable than a flex + shape. + endchoice source "terraform/oci/kconfigs/shapes/Kconfig.flex" +source "terraform/oci/kconfigs/shapes/Kconfig.bm" config TERRAFORM_OCI_OS_IMAGE_OCID string "OCI OS image OCID" diff --git a/terraform/oci/kconfigs/shapes/Kconfig.bm b/terraform/oci/kconfigs/shapes/Kconfig.bm new file mode 100644 index 000000000000..40ef4502bb0a --- /dev/null +++ b/terraform/oci/kconfigs/shapes/Kconfig.bm @@ -0,0 +1,83 @@ +if TERRAFORM_OCI_SHAPE_FAMILY_BARE_METAL + +choice + prompt "OCI shape" + default TERRAFORM_OCI_SHAPE_BM_STANDARD3 + help + Select the basic hardware capabilities that are in each + instance. For more details, see: + + https://docs.oracle.com/en-us/iaas/Content/Compute/References/computeshapes.htm#baremetalshapes + +config TERRAFORM_OCI_SHAPE_BM_STANDARD3 + bool "BM.Standard3" + depends on TARGET_ARCH_X86_64 + help + X9-based standard compute. Processor: Intel Xeon Platinum + 8358. Base frequency 2.6 GHz, max turbo frequency 3.4 GHz. + +config TERRAFORM_OCI_SHAPE_BM_STANDARD_E4 + bool "BM.Standard.E4" + depends on TARGET_ARCH_X86_64 + help + E4-based standard compute. Processor: AMD EPYC 7J13. Base + frequency 2.55 GHz, max boost frequency 3.5 GHz. + +config TERRAFORM_OCI_SHAPE_BM_STANDARD_E5 + bool "BM.Standard.E5" + depends on TARGET_ARCH_X86_64 + help + E5-based standard compute. Processor: AMD EPYC 9J14. Base + frequency 2.4 GHz, max boost frequency 3.7 GHz. + +config TERRAFORM_OCI_SHAPE_BM_STANDARD_A1 + bool "BM.Standard.A1" + depends on TARGET_ARCH_ARM64 + help + OCI Ampere A1 Compute Arm-based standard compute. Each + OCPU corresponds to a single hardware execution thread. + Processor: Ampere Altra Q80-30. Max frequency 3.0 GHz. + +config TERRAFORM_OCI_SHAPE_BM_DENSEIO_E4 + bool "BM.DenseIO.E4" + depends on TARGET_ARCH_X86_64 + help + E4-based dense I/O compute. Processor: AMD EPYC 7J13. + Base frequency 2.55 GHz, max boost frequency 3.5 GHz. + +config TERRAFORM_OCI_SHAPE_BM_DENSEIO_E5 + bool "BM.DenseIO.E5" + depends on TARGET_ARCH_X86_64 + help + E5-based dense I/O compute. Processor: AMD EPYC 9J14. + Base frequency 2.4 GHz, max boost frequency 3.7 GHz. + +config TERRAFORM_OCI_SHAPE_BM_OPTIMIZED3 + bool "BM.Optimized3" + depends on TARGET_ARCH_X86_64 + help + Processor: Intel Xeon 6354. Base frequency 3.0 GHz, max + turbo frequency 3.6 GHz. + +config TERRAFORM_OCI_SHAPE_BM_HPC_E5 + bool "BM.HPC.E5" + depends on TARGET_ARCH_X86_64 + help + Processor: AMD EPYC 9J14. Base frequency 2.4 GHz, max + boost frequency 3.7 GHz. + +endchoice + +config TERRAFORM_OCI_SHAPE + string + output yaml + default "BM.Standard3" if TERRAFORM_OCI_SHAPE_BM_STANDARD3 + default "BM.Standard.E4" if TERRAFORM_OCI_SHAPE_BM_STANDARD_E4 + default "BM.Standard.E5" if TERRAFORM_OCI_SHAPE_BM_STANDARD_E5 + default "BM.Standard.A1" if TERRAFORM_OCI_SHAPE_BM_STANDARD_A1 + default "BM.DenseIO.E4" if TERRAFORM_OCI_SHAPE_BM_DENSEIO_E4 + default "BM.DenseIO.E5" if TERRAFORM_OCI_SHAPE_BM_DENSEIO_E5 + default "BM.Optimized3" if TERRAFORM_OCI_SHAPE_BM_OPTIMIZED3 + default "BM.HPC.E5" if TERRAFORM_OCI_SHAPE_BM_HPC_E5 + +endif # TERRAFORM_OCI_SHAPE_FAMILY_BARE_METAL From patchwork Tue Apr 1 00:59:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034270 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 23B1A2E3371 for ; Tue, 1 Apr 2025 01:00:20 +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=1743469220; cv=none; b=S0avfzpmANoV02nT/nM4aI+6dK3LfAcbiJDHXsxmHKUoAlJF4+9wwx7lp0U8XB0r8jISkapCMhor3tAnipTy3ajd4C634lmLBvbilO9piHhIY0g5sMnGlB4HvE5D4mVg7NMpMtM3FHeVeWvHwiofLhOgD5v0nIgl/C4HDaAKGcU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469220; c=relaxed/simple; bh=OqQDznmVcCXR3ugoHtIx4oNSO140FkuQGJP9LQ3tCgc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=C/ONsNUThuf4Jv5M9Or1iKF/ihd1vJbqhmwmR4E7jnJIJrXsE7iQ1Z89Dt0ZF9ewxWMsHY0Kudyxn39vdw38tiKaegoScrRLSqFSsDi17J7iYCfoG/rdRRsuRDRVwcWHnWIJsGgfQXA/9/r85ab++twakDWy5eq0SakoDYBJEYg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=sonyizEP; 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="sonyizEP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A5000C4CEEA; Tue, 1 Apr 2025 01:00:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469220; bh=OqQDznmVcCXR3ugoHtIx4oNSO140FkuQGJP9LQ3tCgc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sonyizEPnbOTAu+Inbd98V1qM9cXHR5ptYAPGnI45iGt1Ru/X7vM5D/vyjrtzSaU4 oNFOPR3QGEuKmmDeTT9s7PTXEAvGq4Js2t4osrjAH4Kjl5+TY8uU2L3fl/A82vnJLQ 5PisGUltjhpay9kJxXJvnNvq94A2d8r0Bt+GVPUrAhhB2b84BOonptWTP8q4+aZ/vw PH609dZtVG+ljOyU+D6lB6DO2Yyx/EUkS1sN33G8JlaR39PiIBB6scQH0vlfBEzg9e kjTUltrvST1Hv9zpKfmGMWerx8kbBRcYoZvPzbOsuK741VxzMHY7DWEKTGJ8NNZ+G8 4SXeIdLpdZb7A== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 21/31] terraform/OCI: Use "output yaml" for the source image setting Date: Mon, 31 Mar 2025 20:59:50 -0400 Message-ID: <20250401010000.764234-22-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 Refactor: Remove the line in terraform.Makefile that sets "terraform_oci_os_image_ocid" and just pass it directly from Kconfig via an "output yaml" directive. Signed-off-by: Chuck Lever --- scripts/terraform.Makefile | 1 - terraform/oci/kconfigs/Kconfig.compute | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile index 2750b63b01c0..e77f4dd0b474 100644 --- a/scripts/terraform.Makefile +++ b/scripts/terraform.Makefile @@ -95,7 +95,6 @@ TERRAFORM_EXTRA_VARS += terraform_gce_credentials=$(subst ",,$(CONFIG_TERRAFORM_ endif ifeq (y,$(CONFIG_TERRAFORM_OCI)) -TERRAFORM_EXTRA_VARS += terraform_oci_os_image_ocid=$(subst ",,$(CONFIG_TERRAFORM_OCI_OS_IMAGE_OCID)) ifeq (y, $(CONFIG_TERRAFORM_OCI_ASSIGN_PUBLIC_IP)) TERRAFORM_EXTRA_VARS += terraform_oci_assign_public_ip=true else diff --git a/terraform/oci/kconfigs/Kconfig.compute b/terraform/oci/kconfigs/Kconfig.compute index 0e3aac104175..e210e9d44dc0 100644 --- a/terraform/oci/kconfigs/Kconfig.compute +++ b/terraform/oci/kconfigs/Kconfig.compute @@ -33,7 +33,8 @@ source "terraform/oci/kconfigs/shapes/Kconfig.flex" source "terraform/oci/kconfigs/shapes/Kconfig.bm" config TERRAFORM_OCI_OS_IMAGE_OCID - string "OCI OS image OCID" + string "OS image OCID" + output yaml help The OCI ID of the OS image to use. Read this: From patchwork Tue Apr 1 00:59:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034271 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 C927F2E3371 for ; Tue, 1 Apr 2025 01:00:20 +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=1743469220; cv=none; b=tiSitfVrlp3IiXSu+Rr8GCyM4XG46R80YXXUIQ5a8iyX0cZzvnGwFCRf/jbNdQUOuCO3JEh1sdOGIvmIPmpUWGOGmhrAL/k/SMituIXbdSIS5WAdYzzSLXC4rVwAfrWrtyR30+XuGFDW0W+iopCTSEbrL06EZ5mBgQUOkCuQCqU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469220; c=relaxed/simple; bh=7Medx7ACvm74KYGCCbkcvziG6iFftMqtUQZ76JNO7PU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=R7/o8hx9/BzPvPn5xYEdIS2qLytq1v5krQDXiQfd28OR/etn7hu32Vz8CTTg/6nISzFxcykqHH76EOxgFpQp/IxBAN92NuvLZNS4uNzhQCsJSw7sKOVtP59th64dzwMA5B9suXt088g9fLBMQNZOT/S4Tp8XsUNa11xk4s6cpCo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=O4+QB/3O; 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="O4+QB/3O" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 41989C4CEE5; Tue, 1 Apr 2025 01:00:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469220; bh=7Medx7ACvm74KYGCCbkcvziG6iFftMqtUQZ76JNO7PU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O4+QB/3Ov+MLbn2ttOJ+cZTv++fGAtZaNFFLhL387sRG1iT6EC/QB9FrmCKWUoK1Y Q0rTI8+eUY+pQrHk4APWBxJW8MuThffkfZvoiB2MCd2B2juf/nwZOsJjAtMaGCN0sq PZZfEiPR/qeTa2JRco0ys+h+yWHSAsiMDy7/dn2KIvlrKFwZCKDygASEuzbFKAMLZk N1Rc28IHSWdFHwPc20QxXp4fmyB1PBDbLO8SQ8qftYM94wo2ZQcT/zmygepVGd8W/i uYqa/Cq3TUpMzVnBmlw2TanETF4ruV3rd8WJrX0EipnAZ4+9quEmRw3GTJrWUbEGvD z0fMSyWhOc8/w== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 22/31] terraform/OCI: Simplify image selection Date: Mon, 31 Mar 2025 20:59:51 -0400 Message-ID: <20250401010000.764234-23-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 Currently OCI requires users to hunt down the OCID of the particular OS image they wish to deploy by walking through a list of images and regions on Oracle's web site, then copying and pasting the OCID from a region list. This is not terribly user friendly. I'd like to provide a simple menu to make it easier to select an image without spending an hour doing research. The terraform oracle/oci provider has an "oci_core_images" data source that invokes the ListImages API to search for the OCID of an OS image based on it's family and name. Neat! Unfortunately, according to: https://github.com/oracle/terraform-provider-oci/issues/352 the ListImages API returns a list that is dynamically generated on every call. As images are added and removed from OCI, that list will change over time -- in fact it can change between two "terraform apply" calls, which might cause a "terraform destroy" to fail. We want kdevops to have reliable bringup and shutdown to enable automation. As described in: https://docs.public.oneportal.content.oci.oraclecloud.com/en-us/iaas/Content/dev/terraform/ref-images.htm#top the best practice is to stuff fixed image OCIDs into a terraform map variable. It's ugly and requires upkeep, but it guarantees the OCIDs are stable from one "apply" to the next. kdevops now deals with more than a handful of regions and operating systems, so instead of a terraform map variable, I'm going with a solution where Kconfig selects an image and sets its OCID in the gen_tfvars template. That is functionally equivalent to a map variable but IMO it will be easier for us to maintain (either by hand or automatically via a script). Signed-off-by: Chuck Lever --- terraform/oci/kconfigs/Kconfig.compute | 43 +++- .../oci/kconfigs/images/Kconfig.OracleLinux | 237 ++++++++++++++++++ terraform/oci/kconfigs/images/Kconfig.Ubuntu | 162 ++++++++++++ terraform/oci/kconfigs/images/Kconfig.custom | 20 ++ 4 files changed, 456 insertions(+), 6 deletions(-) create mode 100644 terraform/oci/kconfigs/images/Kconfig.OracleLinux create mode 100644 terraform/oci/kconfigs/images/Kconfig.Ubuntu create mode 100644 terraform/oci/kconfigs/images/Kconfig.custom diff --git a/terraform/oci/kconfigs/Kconfig.compute b/terraform/oci/kconfigs/Kconfig.compute index e210e9d44dc0..ceab066cc5e0 100644 --- a/terraform/oci/kconfigs/Kconfig.compute +++ b/terraform/oci/kconfigs/Kconfig.compute @@ -32,10 +32,41 @@ endchoice source "terraform/oci/kconfigs/shapes/Kconfig.flex" source "terraform/oci/kconfigs/shapes/Kconfig.bm" -config TERRAFORM_OCI_OS_IMAGE_OCID - string "OS image OCID" - output yaml +choice + prompt "Distribution" + default TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX help - The OCI ID of the OS image to use. - Read this: - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm + Select the Linux distribution to install on each instance. + +config TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX + bool "Oracle Linux" + help + Select this if you want to use a release of Oracle Linux + as the operating system in your instances. + +config TERRAFORM_OCI_OPERATING_SYSTEM_UBUNTU + bool "Ubuntu" + help + Select this if you want to use a release of Ubuntu Linux + as the operating system in your instances. + +config TERRAFORM_OCI_OPERATING_SYSTEM_CUSTOM + bool "Custom image OCID" + help + Select this if you want to enter a specific OCID for + an OS image. Use this if you wish to use a custom or + marketplace image not included in the fixed choices in + this menu. + + The image you specify must reside in the same region as + your instances. + + More image choices are available: + + https://docs.oracle.com/en-us/iaas/images/ + +endchoice + +source "terraform/oci/kconfigs/images/Kconfig.OracleLinux" +source "terraform/oci/kconfigs/images/Kconfig.Ubuntu" +source "terraform/oci/kconfigs/images/Kconfig.custom" diff --git a/terraform/oci/kconfigs/images/Kconfig.OracleLinux b/terraform/oci/kconfigs/images/Kconfig.OracleLinux new file mode 100644 index 000000000000..d0aa9114c209 --- /dev/null +++ b/terraform/oci/kconfigs/images/Kconfig.OracleLinux @@ -0,0 +1,237 @@ +if TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX + +choice + prompt "OS release" + default TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX_9_5_ARM64 if TARGET_ARCH_ARM64 + default TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX_9_5_X86 if TARGET_ARCH_X86_64 + help + Select the release of Oracle Linux to install on each + instance. + +config TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX_7_9_X86 + bool "Oracle Linux 7.9 (x86)" + depends on TARGET_ARCH_X86_64 + help + (extended support) Oracle-Linux-7.9-2025.01.31-0 + + Image release notes: + https://docs.oracle.com/en-us/iaas/images/oraclelinux-7x/oracle-linux-7-9-2025-01-31-0.htm + +config TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX_7_9_GPU + bool "Oracle Linux 7.9 Gen2 GPU" + depends on TARGET_ARCH_X86_64 + help + (extended support) Oracle-Linux-7.9-Gen2-GPU-2025.01.31-0 + + Image release notes: + https://docs.oracle.com/en-us/iaas/images/oraclelinux-7x/oracle-linux-7-9-gen2-gpu-2025-01-31-0.htm + +config TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX_7_9_ARM64 + bool "Oracle Linux 7.9 (aarch64)" + help + (extended support) Oracle-Linux-7.9-aarch64-2024.11.30-0 + + Image release notes: + https://docs.oracle.com/en-us/iaas/images/oraclelinux-7x/oracle-linux-7-9-aarch64-2024-11-30-0.htm + +config TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX_8_10_GPU + bool "Oracle Linux 8.10 Gen2 GPU" + depends on TARGET_ARCH_X86_64 + help + Oracle-Linux-8.10-Gen2-GPU-2025.03.18-0 + + Image release notes: + https://docs.oracle.com/en-us/iaas/images/oracle-linux-8x/oracle-linux-8-10-gen2-gpu-2025-03-18-0.htm + +config TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX_8_10_ARM64 + bool "Oracle Linux 8.10 (aarch64)" + depends on TARGET_ARCH_ARM64 + help + Oracle-Linux-8.10-aarch64-2025.03.18-0 + + Image release notes: + https://docs.oracle.com/en-us/iaas/images/oracle-linux-8x/oracle-linux-8-10-aarch64-2025-03-18-0.htm + +config TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX_8_10_X86 + bool "Oracle Linux 8.10 (x86)" + depends on TARGET_ARCH_X86_64 + help + Oracle-Linux-8.10-2025.03.18-0 + + Image release notes: + https://docs.oracle.com/en-us/iaas/images/oracle-linux-8x/oracle-linux-8-10-2025-03-18-0.htm + +config TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX_9_5_GPU + bool "Oracle Linux 9.5 Gen2 GPU" + depends on TARGET_ARCH_X86_64 + help + Oracle-Linux-9.5-Gen2-GPU-2025.03.18-0 + + Image release notes: + https://docs.oracle.com/en-us/iaas/images/oracle-linux-9x/oracle-linux-9-5-gen2-gpu-2025-03-18-0.htm + +config TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX_9_5_ARM64 + bool "Oracle Linux 9.5 (aarch64)" + depends on TARGET_ARCH_ARM64 + help + Oracle-Linux-9.5-aarch64-2025.03.18-0 + + Image release notes: + https://docs.oracle.com/en-us/iaas/images/oracle-linux-9x/oracle-linux-9-5-aarch64-2025-03-18-0.htm + +config TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX_9_5_X86 + bool "Oracle Linux 9.5 (x86)" + depends on TARGET_ARCH_X86_64 + help + Oracle-Linux-9.5-2025.03.18-0 + + Image release notes: + https://docs.oracle.com/en-us/iaas/images/oracle-linux-9x/oracle-linux-9-5-2025-03-18-0.htm + +endchoice + +if TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX_7_9_X86 + +config TERRAFORM_OCI_OS_IMAGE_OCID + string + output yaml + default "ocid1.image.oc1.us-chicago-1.aaaaaaaaw4cggpn2wh4jhwpkcjdzvyicfaqblwcc6xq5k4i2jxkg2bx4gm6a" if TERRAFORM_OCI_REGION_ORD + default "ocid1.image.oc1.iad.aaaaaaaaew4bboppacmw7pvlog5wvtygfxhrvv2bfanicvjj2ljrmvtkfdtq" if TERRAFORM_OCI_REGION_IAD + default "ocid1.image.oc1.ca-montreal-1.aaaaaaaaokvcf2uuidul5n7ukneihfkrtrowlyoo22ceowanplkinmbftmca" if TERRAFORM_OCI_REGION_YUL + default "ocid1.image.oc1.ap-hyderabad-1.aaaaaaaaz2glfsxaks4mvrnx5dpcevkm4yo32bls4zkfg7brsklldwgtq2oq" if TERRAFORM_OCI_REGION_HYD + default "ocid1.image.oc1.ca-toronto-1.aaaaaaaa7cuflxmluvu7lumzlz2lcrvhh7seamwsrpyvjfey2ed25pxw5lha" if TERRAFORM_OCI_REGION_YYZ + default "ocid1.image.oc1.us-sanjose-1.aaaaaaaakb25v43zvj44zljk73p2j5e2ew2ycht5obleuy7ntj24pttc65ga" if TERRAFORM_OCI_REGION_SJC + default "ocid1.image.oc1.ap-mumbai-1.aaaaaaaaxtpiye5nnlmdl4a4far26ywp4mw3xtuchg6texgrlrl435mgomaq" if TERRAFORM_OCI_REGION_BOM + default "ocid1.image.oc1.phx.aaaaaaaatvm5xr23xsvjofwybmqfixrsfk4442sjpckjccechfhqso5kt4ia" if TERRAFORM_OCI_REGION_PHX + +endif # TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX_7_9_X86 + +if TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX_7_9_GPU + +config TERRAFORM_OCI_OS_IMAGE_OCID + string + output yaml + default "ocid1.image.oc1.us-chicago-1.aaaaaaaan6dsfja3qduobzk72iw6ocofxesiufcgjckbxampnwuk2q76xiiq" if TERRAFORM_OCI_REGION_ORD + default "ocid1.image.oc1.iad.aaaaaaaavkrcpinzw6otfx4h5wdgfypy7pa43u5nxm3vyur3wmadfacg6yoq" if TERRAFORM_OCI_REGION_IAD + default "ocid1.image.oc1.ca-montreal-1.aaaaaaaakkooyvv6j3ovxkyath4sx66hzly7ayew4apczehvfkujmneaqmwq" if TERRAFORM_OCI_REGION_YUL + default "ocid1.image.oc1.ap-hyderabad-1.aaaaaaaal45sa5nortjwtxfnzcufq4ly5kq7dhshz3e37vumjk7arjknajwa" if TERRAFORM_OCI_REGION_HYD + default "ocid1.image.oc1.ca-toronto-1.aaaaaaaaxyoh65vwphlena44mm5gh56bidphgarl5c5qhbuuzvgbc4oytxtq" if TERRAFORM_OCI_REGION_YYZ + default "ocid1.image.oc1.us-sanjose-1.aaaaaaaa7q72ht4bblpje2twwt6n5rstnbmmg3zsmrro35wj2jrfhwwtnoiq" if TERRAFORM_OCI_REGION_SJC + default "ocid1.image.oc1.ap-mumbai-1.aaaaaaaaevcobrg3izf46fimhmz2xdsnagixvgokyysteuajsdyqdi4lnudq" if TERRAFORM_OCI_REGION_BOM + default "ocid1.image.oc1.phx.aaaaaaaaop2dgnaymj3azm4cm2awycupwldxrqu6h4loo6zfcyez6hfffadq" if TERRAFORM_OCI_REGION_PHX + +endif # TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX_7_9_GPU + +if TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX_7_9_ARM64 + +config TERRAFORM_OCI_OS_IMAGE_OCID + string + output yaml + default "ocid1.image.oc1.ap-mumbai-1.aaaaaaaa7y3qbdzra44m52ugjy5bdnsczazugkspybkejbcebdjqklzcifwa" if TERRAFORM_OCI_REGION_BOM + default "ocid1.image.oc1.iad.aaaaaaaamawldxaesq2w6ypyu6dpwgccgn2llakpymzn2xhs2it3ao3kpeda" if TERRAFORM_OCI_REGION_IAD + default "ocid1.image.oc1.us-sanjose-1.aaaaaaaagd2ujisye2n4qrqxehgkfgqefbthic7pph4sdabdwe5hpjn2yxia" if TERRAFORM_OCI_REGION_SJC + default "ocid1.image.oc1.ap-hyderabad-1.aaaaaaaa267gephgrqd4dimf55szmw7gwqibqxkheyixbz3ptltspla6brnq" if TERRAFORM_OCI_REGION_HYD + default "ocid1.image.oc1.ca-montreal-1.aaaaaaaaboblnxwpnu7qujwuvbnawt7bvmmmnilhzah6qp44fppe2pggpviq" if TERRAFORM_OCI_REGION_YUL + default "ocid1.image.oc1.phx.aaaaaaaawn7p3y4k4nkqjvtjsvufmhz4g2ijthfp6vtcsly6qe37iliw3kcq" if TERRAFORM_OCI_REGION_PHX + default "ocid1.image.oc1.ca-toronto-1.aaaaaaaayxu334z7aijxckl66tne42zudtrqts2ju5iq7e2envn7tp7bvfjq" if TERRAFORM_OCI_REGION_YYZ + default "ocid1.image.oc1.us-chicago-1.aaaaaaaauvy56pg3en7rnmttztnm5naqopw7f4nug4a3bgy6nhed3e7s46fa" if TERRAFORM_OCI_REGION_ORD + +endif # TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX_7_9_ARM64 + +if TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX_8_10_GPU + +config TERRAFORM_OCI_OS_IMAGE_OCID + string + output yaml + default "ocid1.image.oc1.us-chicago-1.aaaaaaaag6nolpaijfzxqy6o4pufxqzmsb53wdhlmt47i6uy7qrlup22ghba" if TERRAFORM_OCI_REGION_ORD + default "ocid1.image.oc1.ap-mumbai-1.aaaaaaaaypx4qk7wgvoxp7ijpfgh2iyolrjawby5fe3bahhpq5jx6qzm6hlq" if TERRAFORM_OCI_REGION_BOM + default "ocid1.image.oc1.phx.aaaaaaaabcjwzgu4e3osnnot6f75b3pj5lyoyi6756u5ihqz6wdrx33t6wxa" if TERRAFORM_OCI_REGION_PHX + default "ocid1.image.oc1.ap-hyderabad-1.aaaaaaaa2xegkn2nihnzhbtc2s7qimattaraxhb7l3ubcusg53izojyatalq" if TERRAFORM_OCI_REGION_HYD + default "ocid1.image.oc1.ca-toronto-1.aaaaaaaasg53rljyobwumy3z4rqx6qbfjo5txibadwztq3kqg5mx3ispi2fq" if TERRAFORM_OCI_REGION_YYZ + default "ocid1.image.oc1.ca-montreal-1.aaaaaaaann7bi7eee2u2yeyuyidz4woqcegnywalip7umbod6aknztgkqpja" if TERRAFORM_OCI_REGION_YUL + default "ocid1.image.oc1.iad.aaaaaaaaj3uhqliqpetwozwm5hbfuqw4ubrhkg7pnez2lwwrlbibqe4o72ga" if TERRAFORM_OCI_REGION_IAD + default "ocid1.image.oc1.us-sanjose-1.aaaaaaaa6dl65tbhiirls2t427juav6d2fnjqjyattzzkssnjys3owsmwqfa" if TERRAFORM_OCI_REGION_SJC + +endif # TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX_8_10_GPU + +if TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX_8_10_ARM64 + +config TERRAFORM_OCI_OS_IMAGE_OCID + string + output yaml + default "ocid1.image.oc1.us-chicago-1.aaaaaaaaoqg3nzwxnkw66rf3f53nomqku3hruwjpdjxwq3i7w7uurkxntshq" if TERRAFORM_OCI_REGION_ORD + default "ocid1.image.oc1.ap-mumbai-1.aaaaaaaa4zhvgsmsftn6j4bxlidb6zq2tziy6v4ylp3tpjwd5nvte2qj3fzq" if TERRAFORM_OCI_REGION_BOM + default "ocid1.image.oc1.phx.aaaaaaaarzkc66ki6qcbykys7hjhoy2avyfp5lj5mwtvbpu7ondaz2rs46ha" if TERRAFORM_OCI_REGION_PHX + default "ocid1.image.oc1.ap-hyderabad-1.aaaaaaaazoyranvzks4xlbfu5s3ylro5m246wja2j77d37a7y6oniq4scspq" if TERRAFORM_OCI_REGION_HYD + default "ocid1.image.oc1.ca-toronto-1.aaaaaaaahhe6tyixhxyc5bv7dxejl4ools5h235ry5kfu6jgstnxqeavtugq" if TERRAFORM_OCI_REGION_YYZ + default "ocid1.image.oc1.ca-montreal-1.aaaaaaaaa33kkau2zsjk4eias7pz6akuff4giijs4dbhzhzka5lbctk2d5da" if TERRAFORM_OCI_REGION_YUL + default "ocid1.image.oc1.iad.aaaaaaaa3zzp4jue2jp5wm2hesslxoq27qqrzxfwdxylcabkv3ginqacgqra" if TERRAFORM_OCI_REGION_IAD + default "ocid1.image.oc1.us-sanjose-1.aaaaaaaagnr4w7bpjky7twkpwn4oag55wqowqjlegqzmiqqha6aiylqu6tta" if TERRAFORM_OCI_REGION_SJC + +endif # TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX_8_10_ARM64 + +if TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX_8_10_X86 + +config TERRAFORM_OCI_OS_IMAGE_OCID + string + output yaml + default "ocid1.image.oc1.us-chicago-1.aaaaaaaa3rpjxl576g3nsurlkzqcsrhruo3frpmfzqjmntqcfaukmhzoeqqq" if TERRAFORM_OCI_REGION_ORD + default "ocid1.image.oc1.ap-mumbai-1.aaaaaaaazviipxxkrka3pvwq4twxm4q2bpqyp6fvv7txx7jlvbxmvtuzfwga" if TERRAFORM_OCI_REGION_BOM + default "ocid1.image.oc1.phx.aaaaaaaaupsoxaochddlvom7joxo3457sw5bfprehlftrifg64zvyetpscga" if TERRAFORM_OCI_REGION_PHX + default "ocid1.image.oc1.ap-hyderabad-1.aaaaaaaa6kzgiyrgaibzgkbcjybt7q7ripbp4qxybzci7z3cxq6jyoe6xnvq" if TERRAFORM_OCI_REGION_HYD + default "ocid1.image.oc1.ca-toronto-1.aaaaaaaa4eqd3xzpt4wej2dhvbmn6qezgp6qs5rx2kvmu55dicdcgtko5o5q" if TERRAFORM_OCI_REGION_YYZ + default "ocid1.image.oc1.ca-montreal-1.aaaaaaaarhsptzukiqy3zeo7e37yxvi2do3gs2xnymlhosz5dwf53dvgymjq" if TERRAFORM_OCI_REGION_YUL + default "ocid1.image.oc1.iad.aaaaaaaa6ihkh6yp6f2e2np4fkucu7rv7d3v6uogy7ya7osfmogkznjaveha" if TERRAFORM_OCI_REGION_IAD + default "ocid1.image.oc1.us-sanjose-1.aaaaaaaarj3piol7pdmcydvgryclnhdr2rce5ozvamumvb3l2fdodbq3wouq" if TERRAFORM_OCI_REGION_SJC + +endif # TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX_8_10_X86 + +if TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX_9_5_GPU + +config TERRAFORM_OCI_OS_IMAGE_OCID + string + output yaml + default "ocid1.image.oc1.us-chicago-1.aaaaaaaafpwtoai7qo6unslyke7nweznm6bof2g6kiyjkrlxfqqi7jtyv6rq" if TERRAFORM_OCI_REGION_ORD + default "ocid1.image.oc1.ap-mumbai-1.aaaaaaaavopk6s6ejcwol4mivfaipbxk6fpmvynhwxtp65prjet6cyyi3e4a" if TERRAFORM_OCI_REGION_BOM + default "ocid1.image.oc1.phx.aaaaaaaajombg57yxesfnlsuq4zjp7uee552u2qolrol3vv26queht227mfq" if TERRAFORM_OCI_REGION_PHX + default "ocid1.image.oc1.ap-hyderabad-1.aaaaaaaaiyemvdwdvm2gaqr7qvioby5vwkvvl54lvaludny6gxqgx4hcxqra" if TERRAFORM_OCI_REGION_HYD + default "ocid1.image.oc1.ca-toronto-1.aaaaaaaaf2dam6k3z45mkthh4ezalp5bidbk45rwdthvlu6uywg2f5wtb5ba" if TERRAFORM_OCI_REGION_YYZ + default "ocid1.image.oc1.ca-montreal-1.aaaaaaaaz5ewjpl7z3qgpjd5autfuxf3qzunzfsuokvqgv7auvjxdwevuyta" if TERRAFORM_OCI_REGION_YUL + default "ocid1.image.oc1.iad.aaaaaaaau4ebstxoehxcndmyypuup2u7dutsnem7iocf3wen3eq6loi3wbha" if TERRAFORM_OCI_REGION_IAD + default "ocid1.image.oc1.us-sanjose-1.aaaaaaaah2rydmd3v7fx24v3mfv4iobw4c6fonwoivkm3lcathnobijqwacq" if TERRAFORM_OCI_REGION_SJC + +endif # TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX_9_5_GPU + +if TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX_9_5_ARM64 + +config TERRAFORM_OCI_OS_IMAGE_OCID + string + output yaml + default "ocid1.image.oc1.us-chicago-1.aaaaaaaavgibokwp4zsq76csi3huy722jmkjq2bnquhyc5loynon6vqyekmq" if TERRAFORM_OCI_REGION_ORD + default "ocid1.image.oc1.ap-mumbai-1.aaaaaaaa4sfujzbvkgsbpeu2my2zvtszddoflbzpx7dmf7nq252q7tg4qsmq" if TERRAFORM_OCI_REGION_BOM + default "ocid1.image.oc1.phx.aaaaaaaa3is5zklasaldyvhbspwe3wep2mu3knhdlbhgn6gksgm54h2k3mya" if TERRAFORM_OCI_REGION_PHX + default "ocid1.image.oc1.ap-hyderabad-1.aaaaaaaajgecqb2h332aesfnke56zs7vhopawsos3vdm2vdzxv4bsi6rapxa" if TERRAFORM_OCI_REGION_HYD + default "ocid1.image.oc1.ca-toronto-1.aaaaaaaand6afptekvywnvosbbtiqkhwpdxpf4lqj77e7f7hp4z4mutfjnjq" if TERRAFORM_OCI_REGION_YYZ + default "ocid1.image.oc1.ca-montreal-1.aaaaaaaayl2scgs4qnzrkfyufmbvbtbxfbzkaoqifo76f4atetpwn77hj2ja" if TERRAFORM_OCI_REGION_YUL + default "ocid1.image.oc1.iad.aaaaaaaawvs4xn6dfl6oo45o2ntziecjy2cbet2mlidvx3ji62oi3jai4u5a" if TERRAFORM_OCI_REGION_IAD + default "ocid1.image.oc1.us-sanjose-1.aaaaaaaandckidue7lzzhey4u2s3m27rwigsholban3l2bvxe6oemakrqsmq" if TERRAFORM_OCI_REGION_SJC + +endif # TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX_9_5_ARM64 + +if TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX_9_5_X86 + +config TERRAFORM_OCI_OS_IMAGE_OCID + string + output yaml + default "ocid1.image.oc1.us-chicago-1.aaaaaaaadgymvb6xuprmddif4jlfu5nzgxqun7rt6bevockugwa3mdhcde4q" if TERRAFORM_OCI_REGION_ORD + default "ocid1.image.oc1.ap-mumbai-1.aaaaaaaaoaz7xssmgj6qudbwdjbfxtgmqnslte7p5lt5vcz66w7ic7zrw7xq" if TERRAFORM_OCI_REGION_BOM + default "ocid1.image.oc1.phx.aaaaaaaad3yrq635f5swbg3g2iwtxvnxl2ytyrdkhurdizz4f6jf6miw4vma" if TERRAFORM_OCI_REGION_PHX + default "ocid1.image.oc1.ap-hyderabad-1.aaaaaaaao72nz2dewwn5ub6hpqgdedkhyxruebuifzrdj4upva645evvtmmq" if TERRAFORM_OCI_REGION_HYD + default "ocid1.image.oc1.ca-toronto-1.aaaaaaaaoxzvhrzruoandezl5itouxnrg32hay3zm4p3hkydqj3dxxdbpikq" if TERRAFORM_OCI_REGION_YYZ + default "ocid1.image.oc1.ca-montreal-1.aaaaaaaaj7q7ofu4kqa5j3gm546xkin4hlf2gakcsbmxjcb4ghaf5irxuwyq" if TERRAFORM_OCI_REGION_YUL + default "ocid1.image.oc1.iad.aaaaaaaatf3vyxzq3pv5jugwixnmnmh7aivqyhtlwalmgwquvp7c4npuy2ba" if TERRAFORM_OCI_REGION_IAD + default "ocid1.image.oc1.us-sanjose-1.aaaaaaaaopxntceb4zygnto7tbi7ezxptoxp3m72jz5ttpp5zfg4iklupr4q" if TERRAFORM_OCI_REGION_SJC + +endif # TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX_9_5_X86 + +endif # TERRAFORM_OCI_OPERATING_SYSTEM_ORACLE_LINUX diff --git a/terraform/oci/kconfigs/images/Kconfig.Ubuntu b/terraform/oci/kconfigs/images/Kconfig.Ubuntu new file mode 100644 index 000000000000..5a87cd4c33c4 --- /dev/null +++ b/terraform/oci/kconfigs/images/Kconfig.Ubuntu @@ -0,0 +1,162 @@ +if TERRAFORM_OCI_OPERATING_SYSTEM_UBUNTU + +choice + prompt "OS release" + default TERRAFORM_OCI_OPERATING_SYSTEM_UBUNTU_24_04_ARM64 if TARGET_ARCH_ARM64 + default TERRAFORM_OCI_OPERATING_SYSTEM_UBUNTU_24_04_X86 if TARGET_ARCH_X86_64 + help + Select the release of Ubuntu to install on each instance. + +config TERRAFORM_OCI_OPERATING_SYSTEM_UBUNTU_20_04_ARM64 + bool "Ubuntu 20.04 (aarch64)" + depends on TARGET_ARCH_ARM64 + help + Canonical-Ubuntu-20.04-aarch64-2025.01.31-1 + + Image release notes: + https://docs.oracle.com/en-us/iaas/images/ubuntu-2004/canonical-ubuntu-20-04-aarch64-2025-01-31-1.htm + +config TERRAFORM_OCI_OPERATING_SYSTEM_UBUNTU_20_04_X86 + bool "Ubuntu 20.04 (x86)" + depends on TARGET_ARCH_X86_64 + help + Canonical-Ubuntu-20.04-2025.01.31-1 + + Image release notes: + https://docs.oracle.com/en-us/iaas/images/ubuntu-2004/canonical-ubuntu-20-04-2025-01-31-1.htm + +config TERRAFORM_OCI_OPERATING_SYSTEM_UBUNTU_22_04_ARM64 + bool "Ubuntu 22.04 (aarch64)" + depends on TARGET_ARCH_ARM64 + help + Canonical-Ubuntu-22.04-aarch64-2025.01.31-1 + + Image release notes: + https://docs.oracle.com/en-us/iaas/images/ubuntu-2204/canonical-ubuntu-22-04-aarch64-2025-01-31-1.htm + +config TERRAFORM_OCI_OPERATING_SYSTEM_UBUNTU_22_04_X86 + bool "Ubuntu 22.04 (x86)" + depends on TARGET_ARCH_X86_64 + help + Canonical-Ubuntu-22.04-2025.01.31-1 + + Image release notes: + https://docs.oracle.com/en-us/iaas/images/ubuntu-2204/canonical-ubuntu-22-04-2025-01-31-1.htm + +config TERRAFORM_OCI_OPERATING_SYSTEM_UBUNTU_24_04_ARM64 + bool "Ubuntu 24.04 (aarch64)" + depends on TARGET_ARCH_ARM64 + help + Canonical-Ubuntu-24.04-aarch64-2025.01.31-1 + + Image release notes: + https://docs.oracle.com/en-us/iaas/images/ubuntu-2404/canonical-ubuntu-24-04-aarch64-2025-01-31-1.htm + +config TERRAFORM_OCI_OPERATING_SYSTEM_UBUNTU_24_04_X86 + bool "Ubuntu 24.04 (x86)" + depends on TARGET_ARCH_X86_64 + help + Canonical-Ubuntu-24.04-2025.01.31-1 + + Image release notes: + https://docs.oracle.com/en-us/iaas/images/ubuntu-2404/canonical-ubuntu-24-04-2025-01-31-1.htm + +endchoice + +if TERRAFORM_OCI_OPERATING_SYSTEM_UBUNTU_20_04_ARM64 + +config TERRAFORM_OCI_OS_IMAGE_OCID + string + output yaml + default "ocid1.image.oc1.ap-hyderabad-1.aaaaaaaawnlatjgnpqmaercoleknle5nml47l23iwnxi7ba4xup5ajyarv6q" if TERRAFORM_OCI_REGION_HYD + default "ocid1.image.oc1.ap-mumbai-1.aaaaaaaawkgecsy7fbxqeus5zpw5n7ykyeugzizcehrildz7pzavfjrcsswa" if TERRAFORM_OCI_REGION_BOM + default "ocid1.image.oc1.ca-montreal-1.aaaaaaaaesuvbpyo4lpim5xxx3lwj4lcppfkzp6tsape336epukyndi2pora" if TERRAFORM_OCI_REGION_YUL + default "ocid1.image.oc1.ca-toronto-1.aaaaaaaaoox5ewo5bq67sr2spakzdiw4rrxjlgbr25ucqwglb4aonastyhzq" if TERRAFORM_OCI_REGION_YYZ + default "ocid1.image.oc1.iad.aaaaaaaan5qjp6hcvi2ry24zp233wlotljj4llfghqbyn2yoon6wnc3se6pa" if TERRAFORM_OCI_REGION_IAD + default "ocid1.image.oc1.us-chicago-1.aaaaaaaa7habuxhtxdty52x47eq27lq7gjweoun4urafpv2s6ysggbp6nrxa" if TERRAFORM_OCI_REGION_ORD + default "ocid1.image.oc1.phx.aaaaaaaaji2v46qtemmx7bpuoomw2uvrsatvgxrlnp3orvdptbl6ppbal67q" if TERRAFORM_OCI_REGION_PHX + default "ocid1.image.oc1.us-sanjose-1.aaaaaaaa2dt3oqmhwwd3z2o3wynfltfa3rms6pc2uhvr2kmjmmyvqr2li7pq" if TERRAFORM_OCI_REGION_SJC + +endif # TERRAFORM_OCI_OPERATING_SYSTEM_UBUNTU_20_04_ARM64 + +if TERRAFORM_OCI_OPERATING_SYSTEM_UBUNTU_20_04_X86 + +config TERRAFORM_OCI_OS_IMAGE_OCID + string + output yaml + default "ocid1.image.oc1.ap-hyderabad-1.aaaaaaaa3uvxetf4g6beur4qn2ublcl6set7qtda2rcfcv5h7vul6aut2q7q" if TERRAFORM_OCI_REGION_HYD + default "ocid1.image.oc1.ap-mumbai-1.aaaaaaaaj276t4bm4hyqyu44mjcuzndgn6lku4th3nfaglwpiyzsp6lozqlq" if TERRAFORM_OCI_REGION_BOM + default "ocid1.image.oc1.ca-montreal-1.aaaaaaaaagkdbfci5rxx5yikkifi7culqosi7r623osdzqv25rkanxd66dbq" if TERRAFORM_OCI_REGION_YUL + default "ocid1.image.oc1.ca-toronto-1.aaaaaaaafbbzzsemfbol5vvyevlmqxhcv6avfo5z6larkuty4safdn3epoha" if TERRAFORM_OCI_REGION_YYZ + default "ocid1.image.oc1.iad.aaaaaaaaw65jff6tnjbr7x2c2lr3qlf46l2sthpuidxaurmar2oxjmqry3qa" if TERRAFORM_OCI_REGION_IAD + default "ocid1.image.oc1.us-chicago-1.aaaaaaaagyn7e55mr27m7ttkp2exvdix4ugfl2jbl66xognsge44vuqat4ma" if TERRAFORM_OCI_REGION_ORD + default "ocid1.image.oc1.phx.aaaaaaaazjumsfmhi2tztgs7wuhesifaj2fw47xmyycltazjmr5xa6k7do7q" if TERRAFORM_OCI_REGION_PHX + default "ocid1.image.oc1.us-sanjose-1.aaaaaaaaka77df4vad27cm7oamg3zji6ir5zrvbwbkm7ks7rvucd3bwsbqnq" if TERRAFORM_OCI_REGION_SJC + +endif # TERRAFORM_OCI_OPERATING_SYSTEM_UBUNTU_20_04_X86 + +if TERRAFORM_OCI_OPERATING_SYSTEM_UBUNTU_22_04_ARM64 + +config TERRAFORM_OCI_OS_IMAGE_OCID + string + output yaml + default "ocid1.image.oc1.ap-hyderabad-1.aaaaaaaaca7s2s5pgnooszcjysi7pknrimayqjds6knvjascphe2r767m6vq" if TERRAFORM_OCI_REGION_HYD + default "ocid1.image.oc1.ap-mumbai-1.aaaaaaaamvlfwzlzk6jkyuhoylf6k3n5r7tz6m2lvf5fqjdpsrdwqk2dtcqa" if TERRAFORM_OCI_REGION_BOM + default "ocid1.image.oc1.ca-montreal-1.aaaaaaaai6c6hx7wvx5l3oikjcv7am3n23etmbuu3byic3grzhx5ylthigca" if TERRAFORM_OCI_REGION_YUL + default "ocid1.image.oc1.ca-toronto-1.aaaaaaaa7fy2cysnjwlpoghk5ax65jmvyteg4bjmji6xmm4gti6xg4kmgfia" if TERRAFORM_OCI_REGION_YYZ + default "ocid1.image.oc1.iad.aaaaaaaaq3uhgye3ryjqjcnnmtk5u4ipa5ffhxawa6nvgelzccz5x3pfel4a" if TERRAFORM_OCI_REGION_IAD + default "ocid1.image.oc1.us-chicago-1.aaaaaaaar5u2rj2ahg2btnlmnxhzijozcuqb5lhjit327wesufuhjkytfwha" if TERRAFORM_OCI_REGION_ORD + default "ocid1.image.oc1.phx.aaaaaaaa7f6r242tdb2roknj3odb264g2tduvc2je2u4kbp3hqatiy4sngcq" if TERRAFORM_OCI_REGION_PHX + default "ocid1.image.oc1.us-sanjose-1.aaaaaaaax6vsn7c34viq7yfu3j3v554x6dulorapywrorheltorxoi5on4dq" if TERRAFORM_OCI_REGION_SJC + +endif # TERRAFORM_OCI_OPERATING_SYSTEM_UBUNTU_22_04_ARM64 + +if TERRAFORM_OCI_OPERATING_SYSTEM_UBUNTU_22_04_X86 + +config TERRAFORM_OCI_OS_IMAGE_OCID + string + output yaml + default "ocid1.image.oc1.ap-hyderabad-1.aaaaaaaalldybw6d43ihqwcqeeedsncrl4s7qfczeqwq2eb5cohxj2gyp72q" if TERRAFORM_OCI_REGION_HYD + default "ocid1.image.oc1.ap-mumbai-1.aaaaaaaaooprivsfvvblwxhl2oww3djmz4mnjxjqczxunvahu5dvt3dwlfka" if TERRAFORM_OCI_REGION_BOM + default "ocid1.image.oc1.ca-montreal-1.aaaaaaaadstv5y7ovuhvg354zu4mocto6eyy4frnnfartpl34hmaupg6upka" if TERRAFORM_OCI_REGION_YUL + default "ocid1.image.oc1.ca-toronto-1.aaaaaaaaf6wyj6ap2frgctd7xj7pkxwvj7gowxinvy6xbjzz3z4cv2d5ycfa" if TERRAFORM_OCI_REGION_YYZ + default "ocid1.image.oc1.iad.aaaaaaaablkb5j2kdyqehb7qp2scdyuwslknidn4a53qzje2fxcbw3ji5gta" if TERRAFORM_OCI_REGION_IAD + default "ocid1.image.oc1.us-chicago-1.aaaaaaaa3dfmmuqlupm4gruk5weh5mncxbmfzn36uoj2relmdwvud44zc3ea" if TERRAFORM_OCI_REGION_ORD + default "ocid1.image.oc1.phx.aaaaaaaaccxuq5zox772ncsaggg52xngwcipzfqoqwu7x73owhvd7ula7xpa" if TERRAFORM_OCI_REGION_PHX + default "ocid1.image.oc1.us-sanjose-1.aaaaaaaappswsfuaodghkbps5kjh3bhjxxpaig56wiirxhjlo5tktsuypkha" if TERRAFORM_OCI_REGION_SJC + +endif # TERRAFORM_OCI_OPERATING_SYSTEM_UBUNTU_22_04_X86 + +if TERRAFORM_OCI_OPERATING_SYSTEM_UBUNTU_24_04_ARM64 + +config TERRAFORM_OCI_OS_IMAGE_OCID + string + output yaml + default "ocid1.image.oc1.ap-hyderabad-1.aaaaaaaagkujhljfnogpc4zmmith4sbyh32ltdnxrjx7wksssyv3yv3xkasq" if TERRAFORM_OCI_REGION_HYD + default "ocid1.image.oc1.ap-mumbai-1.aaaaaaaat27vwnwxtqovgbceettrrkmvlgwgyn3vj7rhyblih7omqhi4cioa" if TERRAFORM_OCI_REGION_BOM + default "ocid1.image.oc1.ca-montreal-1.aaaaaaaayojwvhljgwqgpdyqcqdjh4jgbcfd6hu2axdogi4c3si5stmdcjxa" if TERRAFORM_OCI_REGION_YUL + default "ocid1.image.oc1.ca-toronto-1.aaaaaaaaj4vzogabouc3ypajurmwx53juolg745la7mmi4qj3grijoaziwlq" if TERRAFORM_OCI_REGION_YYZ + default "ocid1.image.oc1.iad.aaaaaaaahga37ytba47p2msqzbh5erbqvniyybcvteuh646vgyw4tltustka" if TERRAFORM_OCI_REGION_IAD + default "ocid1.image.oc1.us-chicago-1.aaaaaaaasghgl3azcm2kjya2p7urk4nnpfjlrxlfeosn5jc6hm5epn7gkrra" if TERRAFORM_OCI_REGION_ORD + default "ocid1.image.oc1.phx.aaaaaaaag7js2gmz5yrqtnnjirri52hyqvsymn7gp5a7gwg5jtd2jowpi7tq" if TERRAFORM_OCI_REGION_PHX + default "ocid1.image.oc1.us-sanjose-1.aaaaaaaatsp47wenhtuubuusyi2pgohpnal5fz6jyz4ur5n4juwhj2n2egpq" if TERRAFORM_OCI_REGION_SJC + +endif # TERRAFORM_OCI_OPERATING_SYSTEM_UBUNTU_24_04_ARM64 + +if TERRAFORM_OCI_OPERATING_SYSTEM_UBUNTU_24_04_X86 + +config TERRAFORM_OCI_OS_IMAGE_OCID + string + output yaml + default "ocid1.image.oc1.ap-hyderabad-1.aaaaaaaakzztav5leofa43dcc7uecenhjhazdxlaj7u3kgnfsu65fcw6c5wa" if TERRAFORM_OCI_REGION_HYD + default "ocid1.image.oc1.ap-mumbai-1.aaaaaaaayvok7wg6qwbf2nfeohcqroie2eyplrlxsuwjut7rdugg7jftk7pa" if TERRAFORM_OCI_REGION_BOM + default "ocid1.image.oc1.ca-montreal-1.aaaaaaaa33jzjdmexcf5zaiia2mhjou5xsgatzaqm4mwgqejp2f77bnjhwpa" if TERRAFORM_OCI_REGION_YUL + default "ocid1.image.oc1.ca-toronto-1.aaaaaaaadtwzeffczkghs325xbzeocp4i7ghpeims5insf6a65kxcpmk4bwq" if TERRAFORM_OCI_REGION_YYZ + default "ocid1.image.oc1.iad.aaaaaaaaaja5re7chpwbyrdk57xya7qoxdktskrn5lph7fsuai5zccaefawa" if TERRAFORM_OCI_REGION_IAD + default "ocid1.image.oc1.us-chicago-1.aaaaaaaaslqsnubarsgmpktkbewqedpf76vp6e5k7nafoxpx3aaryag2a6ba" if TERRAFORM_OCI_REGION_ORD + default "ocid1.image.oc1.phx.aaaaaaaapplpp6okoc73a23mdag6k6mwgscofpx2p7bcigeo3ztjktsd53pa" if TERRAFORM_OCI_REGION_PHX + default "ocid1.image.oc1.us-sanjose-1.aaaaaaaaebdhewufiuvsm6kh2eccurg5zdchwfr24heayt4h4bwenee3lwka" if TERRAFORM_OCI_REGION_SJC + +endif # TERRAFORM_OCI_OPERATING_SYSTEM_UBUNTU_24_04_X86 + +endif # TERRAFORM_OCI_OPERATING_SYSTEM_UBUNTU diff --git a/terraform/oci/kconfigs/images/Kconfig.custom b/terraform/oci/kconfigs/images/Kconfig.custom new file mode 100644 index 000000000000..144b974fbe08 --- /dev/null +++ b/terraform/oci/kconfigs/images/Kconfig.custom @@ -0,0 +1,20 @@ +if TERRAFORM_OCI_OPERATING_SYSTEM_CUSTOM + +config TERRAFORM_OCI_OS_IMAGE_OCID + string "OS image OCID" + output yaml + help + An image is a template of a virtual hard drive. It + contains the operating system and other software for each + instance. Select an image by specifying the OCID of the + image to use. You can select: + + - An older release than the latest image release + - An older operating system release + - A custom-made image + + More detail is available: + + https://docs.oracle.com/en-us/iaas/Content/Compute/References/bringyourownimage.htm + +endif # TERRAFORM_OCI_OPERATING_SYSTEM_CUSTOM From patchwork Tue Apr 1 00:59:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034272 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 D8A722E3371 for ; Tue, 1 Apr 2025 01:00:21 +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=1743469221; cv=none; b=bcoH08R4XsrCdt2xwwrakFhaP/7nzIBez0URRYIff44++mM9siBTZZ9dfEmD+lizujZzTvjY16whuipddzNy5oK6wdM5Q7NFYuczgDhLqpXxyYlHa24RqhycW/JLovtb9hLeMfyYumanleZ5UywZ/mIEc9lutBKfjJAb5EDG5D8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469221; c=relaxed/simple; bh=EcEoeoK/yJ9Dc2CIS1+esSM72oZx6GCwjtlkiubFls4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eVDocZh7a2PXgLLDndDqY86Q5hH5W4qGO7gMfQoGDufL2ULnaWglrQSXu/GfCTcsk0AGbl9+t7AsVu0L+yBIakx02HxxyNwkYLcFVwDjJdipiJG/0SLacYxYijlzk+iUit9wFlKuxKT1wx8QSOoUAgWuhr/Ug9IHgXYgx2mOZ+Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XlkC1ZrT; 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="XlkC1ZrT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E4AD0C4CEEA; Tue, 1 Apr 2025 01:00:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469221; bh=EcEoeoK/yJ9Dc2CIS1+esSM72oZx6GCwjtlkiubFls4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XlkC1ZrTqoQ3VUB00mMYpAizCu3q2bTvw7Gf4PGOvo5FjT2ILA5Q08hqDGYFBqSSD ozjMuzzxAnsIppN+nQNQbxasQ4Plii6l9DcpOqfjx12rggF/3Naryzi8JCrZk/ihGd KcnK3mqrZa8/zPwavW3q9M88pKFZh4Zc4GwuJn8lQewSmsOHPOxmr04y23+cWYBMck VrJkxO34vJCgOys3j2KhPzfFt7EvGmEFz1GJ+RNvwOLVM/VAwB1nkeQHNW4FURTXCE xgVO1zp2R2O/EY7gzwIT5v+Gb5yTgOSNl4lEeFoOcsAB1LvtEUboVaDrrUaJBwG3MT P7PWaTTNe5VQg== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 23/31] terraform/OCI: Remove TERRAFORM_OCI_VOLUMES_ENABLE_EXTRA Date: Mon, 31 Mar 2025 20:59:52 -0400 Message-ID: <20250401010000.764234-24-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 Chandan and I have noticed that "enable extra disks, select 2 per instance" is pretty much exactly the same as "don't enable extra disks". Simplify the extra disks selector by removing the check box and making "2 disks per instance" the default. Signed-off-by: Chuck Lever --- .../templates/oci/terraform.tfvars.j2 | 6 -- scripts/terraform.Makefile | 11 --- terraform/oci/kconfigs/Kconfig.storage | 75 ++++--------------- terraform/oci/main.tf | 40 +--------- terraform/oci/vars.tf | 19 +---- 5 files changed, 17 insertions(+), 134 deletions(-) diff --git a/playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2 b/playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2 index a747a4188e7b..fd3d9b853c05 100644 --- a/playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2 +++ b/playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2 @@ -15,16 +15,10 @@ 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_subnet_ocid = "{{ terraform_oci_subnet_ocid }}" -oci_volumes_enable_extra = "{{ terraform_oci_volumes_enable_extra | lower }}" -{% if terraform_oci_volumes_enable_extra %} oci_volumes_per_instance = {{ terraform_oci_volumes_per_instance }} oci_volumes_size = {{ terraform_oci_volumes_size }} -{% else %} -oci_data_volume_display_name = "{{ terraform_oci_data_volume_display_name }}" oci_data_volume_device_file_name = "{{ terraform_oci_data_volume_device_file_name }}" -oci_sparse_volume_display_name = "{{ terraform_oci_sparse_volume_display_name }}" oci_sparse_volume_device_file_name = "{{ terraform_oci_sparse_volume_device_file_name }}" -{% endif %} ssh_config_pubkey_file = "{{ kdevops_terraform_ssh_config_pubkey_file }}" ssh_config_user = "{{ kdevops_terraform_ssh_config_user }}" diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile index e77f4dd0b474..d9e28050a508 100644 --- a/scripts/terraform.Makefile +++ b/scripts/terraform.Makefile @@ -101,17 +101,6 @@ else TERRAFORM_EXTRA_VARS += terraform_oci_assign_public_ip=false endif TERRAFORM_EXTRA_VARS += terraform_oci_subnet_ocid=$(subst ",,$(CONFIG_TERRAFORM_OCI_SUBNET_OCID)) - -ifeq (y, $(CONFIG_TERRAFORM_OCI_VOLUMES_ENABLE_EXTRA)) -TERRAFORM_EXTRA_VARS += terraform_oci_volumes_enable_extra=true -else -TERRAFORM_EXTRA_VARS += terraform_oci_volumes_enable_extra=false -TERRAFORM_EXTRA_VARS += terraform_oci_data_volume_display_name=$(subst ",,$(CONFIG_TERRAFORM_OCI_DATA_VOLUME_DISPLAY_NAME)) -TERRAFORM_EXTRA_VARS += terraform_oci_sparse_volume_display_name=$(subst ",,$(CONFIG_TERRAFORM_OCI_SPARSE_VOLUME_DISPLAY_NAME)) -endif -TERRAFORM_EXTRA_VARS += terraform_oci_data_volume_device_file_name=$(subst ",,$(CONFIG_TERRAFORM_OCI_DATA_VOLUME_DEVICE_FILE_NAME)) -TERRAFORM_EXTRA_VARS += terraform_oci_sparse_volume_device_file_name=$(subst ",,$(CONFIG_TERRAFORM_OCI_SPARSE_VOLUME_DEVICE_FILE_NAME)) - endif ifeq (y,$(CONFIG_TERRAFORM_OPENSTACK)) diff --git a/terraform/oci/kconfigs/Kconfig.storage b/terraform/oci/kconfigs/Kconfig.storage index 8b2885a07d63..ed872a26834e 100644 --- a/terraform/oci/kconfigs/Kconfig.storage +++ b/terraform/oci/kconfigs/Kconfig.storage @@ -1,69 +1,50 @@ -config TERRAFORM_OCI_VOLUMES_ENABLE_EXTRA - bool "Enable additional block devices" - default n - help - Enable this to provision up to 10 extra block devices - on each target node. - -if TERRAFORM_OCI_VOLUMES_ENABLE_EXTRA - choice prompt "Count of extra block volumes" - default TERRAFORM_OCI_VOLUMES_PER_INSTANCE_4 + default TERRAFORM_OCI_VOLUMES_PER_INSTANCE_2 help - The count of extra block devices attached to each target - node. + The count of extra block devices attached to each + instance. + +config TERRAFORM_OCI_VOLUMES_PER_INSTANCE_0 + bool "0" + +config TERRAFORM_OCI_VOLUMES_PER_INSTANCE_1 + bool "1" config TERRAFORM_OCI_VOLUMES_PER_INSTANCE_2 bool "2" - help - Provision 2 extra volumes per target node. config TERRAFORM_OCI_VOLUMES_PER_INSTANCE_3 bool "3" - help - Provision 3 extra volumes per target node. config TERRAFORM_OCI_VOLUMES_PER_INSTANCE_4 bool "4" - help - Provision 4 extra volumes per target node. config TERRAFORM_OCI_VOLUMES_PER_INSTANCE_5 bool "5" - help - Provision 5 extra volumes per target node. config TERRAFORM_OCI_VOLUMES_PER_INSTANCE_6 bool "6" - help - Provision 6 extra volumes per target node. config TERRAFORM_OCI_VOLUMES_PER_INSTANCE_7 bool "7" - help - Provision 7 extra volumes per target node. config TERRAFORM_OCI_VOLUMES_PER_INSTANCE_8 bool "8" - help - Provision 8 extra volumes per target node. config TERRAFORM_OCI_VOLUMES_PER_INSTANCE_9 bool "9" - help - Provision 9 extra volumes per target node. config TERRAFORM_OCI_VOLUMES_PER_INSTANCE_10 bool "10" - help - Provision 10 extra volumes per target node. endchoice config TERRAFORM_OCI_VOLUMES_PER_INSTANCE int output yaml + default 0 if TERRAFORM_OCI_VOLUMES_PER_INSTANCE_0 + default 1 if TERRAFORM_OCI_VOLUMES_PER_INSTANCE_1 default 2 if TERRAFORM_OCI_VOLUMES_PER_INSTANCE_2 default 3 if TERRAFORM_OCI_VOLUMES_PER_INSTANCE_3 default 4 if TERRAFORM_OCI_VOLUMES_PER_INSTANCE_4 @@ -76,7 +57,7 @@ config TERRAFORM_OCI_VOLUMES_PER_INSTANCE choice prompt "Volume size for each additional volume" - default TERRAFORM_OCI_VOLUMES_SIZE_50G + default TERRAFORM_OCI_VOLUMES_SIZE_128G help OCI implements volume sizes between 50G and 32T. In some cases, 50G volumes are in the free tier. @@ -141,44 +122,16 @@ config TERRAFORM_OCI_VOLUMES_SIZE default 4096 if TERRAFORM_OCI_VOLUMES_SIZE_4096G default 8192 if TERRAFORM_OCI_VOLUMES_SIZE_8192G -endif # TERRAFORM_OCI_VOLUMES_ENABLE_EXTRA - -if !TERRAFORM_OCI_VOLUMES_ENABLE_EXTRA - -config TERRAFORM_OCI_DATA_VOLUME_DISPLAY_NAME - string "Display name to use for the data volume" - default "data" - help - Human readable data volume instance name - Read this: - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm - -endif # !TERRAFORM_OCI_VOLUMES_ENABLE_EXTRA - config TERRAFORM_OCI_DATA_VOLUME_DEVICE_FILE_NAME string "Data volume's device file name" + output yaml default "/dev/oracleoci/oraclevdb" help Data volume's device file name - Read this: - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm - -if !TERRAFORM_OCI_VOLUMES_ENABLE_EXTRA - -config TERRAFORM_OCI_SPARSE_VOLUME_DISPLAY_NAME - string "Display name to use for the sparse volume" - default "sparse" - help - Human readable sparse volume instance name - Read this: - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm - -endif # !TERRAFORM_OCI_VOLUMES_ENABLE_EXTRA config TERRAFORM_OCI_SPARSE_VOLUME_DEVICE_FILE_NAME string "Sparse volume's device file name" + output yaml default "/dev/oracleoci/oraclevdc" help Sparse volume's device file name - Read this: - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm diff --git a/terraform/oci/main.tf b/terraform/oci/main.tf index 6991644d83b8..f6596a104c51 100644 --- a/terraform/oci/main.tf +++ b/terraform/oci/main.tf @@ -40,46 +40,8 @@ resource "oci_core_instance" "kdevops_instance" { preserve_boot_volume = false } -resource "oci_core_volume" "kdevops_data_disk" { - count = var.oci_volumes_enable_extra == "true" ? 0 : local.kdevops_num_boxes - - availability_domain = data.oci_identity_availability_domain.kdevops_av_domain.name - compartment_id = data.oci_identity_compartments.kdevops_compartment.compartments[0].id - display_name = var.oci_data_volume_display_name - size_in_gbs = 50 -} - -resource "oci_core_volume" "kdevops_sparse_disk" { - count = var.oci_volumes_enable_extra == "true" ? 0 : local.kdevops_num_boxes - - availability_domain = data.oci_identity_availability_domain.kdevops_av_domain.name - compartment_id = data.oci_identity_compartments.kdevops_compartment.compartments[0].id - display_name = var.oci_sparse_volume_display_name - size_in_gbs = 120 -} - -resource "oci_core_volume_attachment" "kdevops_data_volume_attachment" { - count = var.oci_volumes_enable_extra == "true" ? 0 : local.kdevops_num_boxes - - attachment_type = "paravirtualized" - instance_id = element(oci_core_instance.kdevops_instance.*.id, count.index) - volume_id = element(oci_core_volume.kdevops_data_disk.*.id, count.index) - - device = var.oci_data_volume_device_file_name -} - -resource "oci_core_volume_attachment" "kdevops_sparse_disk_attachment" { - count = var.oci_volumes_enable_extra == "true" ? 0 : local.kdevops_num_boxes - - attachment_type = "paravirtualized" - instance_id = element(oci_core_instance.kdevops_instance.*.id, count.index) - volume_id = element(oci_core_volume.kdevops_sparse_disk.*.id, count.index) - - device = var.oci_sparse_volume_device_file_name -} - module "volumes" { - count = var.oci_volumes_enable_extra == "true" ? local.kdevops_num_boxes : 0 + count = local.kdevops_num_boxes source = "./volumes" vol_availability_domain = data.oci_identity_availability_domain.kdevops_av_domain.name diff --git a/terraform/oci/vars.tf b/terraform/oci/vars.tf index f760fbb776fa..7c19720bebc2 100644 --- a/terraform/oci/vars.tf +++ b/terraform/oci/vars.tf @@ -65,11 +65,6 @@ variable "oci_subnet_ocid" { type = string } -variable "oci_volumes_enable_extra" { - description = "Create additional block volumes per instance" - type = bool -} - variable "oci_volumes_per_instance" { description = "The count of additional block volumes per instance" type = number @@ -80,22 +75,12 @@ variable "oci_volumes_size" { type = number } -variable "oci_data_volume_display_name" { - description = "Display name to use for the data volume" - type = string -} - -variable oci_data_volume_device_file_name { +variable "oci_data_volume_device_file_name" { description = "Data volume's device file name" type = string } -variable "oci_sparse_volume_display_name" { - description = "Display name to use for the sparse volume" - type = string -} - -variable oci_sparse_volume_device_file_name { +variable "oci_sparse_volume_device_file_name" { description = "Sparse volume's device file name" type = string } From patchwork Tue Apr 1 00:59:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034273 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 07A885234 for ; Tue, 1 Apr 2025 01:00:22 +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=1743469222; cv=none; b=gqxDP4k2XrcjgDz/cVbYio1L7a7hxaZ8P2ryg0nWVIdMqmungZEX8iDSEnyTdjbAvViOvlda8nXPCOJSuhMpkR+vPa6TyDSb08G5fHQpP3ks88I4vXxijOCL3e23GkyLQSavVg7x98uUMazXg2+dlXIrjDhOGUZ2kN52e51OfTk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469222; c=relaxed/simple; bh=qJJcBM7v7HiZnrx25McwiqhavsxuW0QDeb5k04mgLuU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=s134vcYPsFAb8lJGnBIZUftUy3S8JnUfn4KsNWtNR5A7zDpIm51Ea/HWotTSIToSk2UoBNQ+2Wobu1bBblxjBgcPitG751C9muYXrDC/WfC6DGSb2DPceM47wpTKlPXKo+NkSE7R87B72nU9U6ehv16p5c5J4AmouqnCQLZaEoc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=heR9KjHJ; 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="heR9KjHJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 846F8C4CEE3; Tue, 1 Apr 2025 01:00:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469221; bh=qJJcBM7v7HiZnrx25McwiqhavsxuW0QDeb5k04mgLuU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=heR9KjHJnaNZIy2bxxCB+cqg+xL2RN79rZTMWAT7O9l0oAMPeddLk2OrlJxJqyt7d pWF1aRZ/wyMudb+jShArW0sPMM7BUulR82F5NUe7jGNKWVeOx5RjQmwjUhDRuoE/I/ 2sCDta7dJ6c/YaIwwsKpc7EAcdLnqcHECiszM02IvejuWF5NvbIr4PL87/3b+dOKEZ B5L70E4NkE6RSp9fOCsYE4oUiREbNrvySsEgpkhS31Qg2piX1naPb+BqtsSEJZ2xGe YWJ7LENPQ3+rB3KV+6lraLsd7l8DpFoUzqhPIE/F/L9ZMO02gTGz2C0t1A691ednrU cXxOXcP1XiArg== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 24/31] terraform/OCI: Use "output yaml" for the assign_public_ip" setting Date: Mon, 31 Mar 2025 20:59:53 -0400 Message-ID: <20250401010000.764234-25-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 Refactor: Remove the line in terraform.Makefile that sets "terraform_oci_assign_public_ip" and just pass it directly from Kconfig via an "output yaml" directive. As an additional clean up, update the help text. Signed-off-by: Chuck Lever --- playbooks/roles/gen_tfvars/defaults/main.yml | 2 +- .../roles/gen_tfvars/templates/oci/terraform.tfvars.j2 | 2 +- scripts/terraform.Makefile | 5 ----- terraform/oci/kconfigs/Kconfig.network | 9 +++++---- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/playbooks/roles/gen_tfvars/defaults/main.yml b/playbooks/roles/gen_tfvars/defaults/main.yml index f64102b2fbf5..b6caadcb7e0c 100644 --- a/playbooks/roles/gen_tfvars/defaults/main.yml +++ b/playbooks/roles/gen_tfvars/defaults/main.yml @@ -48,7 +48,7 @@ terraform_gce_scatch_disk_type: "invalid" terraform_gce_image_name: "invalid" terraform_gce_credentials: "invalid" -terraform_oci_assign_public_ip: "false" +terraform_oci_assign_public_ip: false terraform_openstack_cloud_name: "invalid" terraform_openstack_instance_prefix: "invalid" diff --git a/playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2 b/playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2 index fd3d9b853c05..192d72ff32a9 100644 --- a/playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2 +++ b/playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2 @@ -13,7 +13,7 @@ oci_instance_flex_ocpus = {{ terraform_oci_instance_flex_ocpus }} oci_instance_flex_memory_in_gbs = {{ terraform_oci_instance_flex_memory_in_gbs }} {% endif %} oci_os_image_ocid = "{{ terraform_oci_os_image_ocid }}" -oci_assign_public_ip = "{{ terraform_oci_assign_public_ip | lower }}" +oci_assign_public_ip = {{ terraform_oci_assign_public_ip | lower }} oci_subnet_ocid = "{{ terraform_oci_subnet_ocid }}" oci_volumes_per_instance = {{ terraform_oci_volumes_per_instance }} oci_volumes_size = {{ terraform_oci_volumes_size }} diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile index d9e28050a508..99aadfc51fff 100644 --- a/scripts/terraform.Makefile +++ b/scripts/terraform.Makefile @@ -95,11 +95,6 @@ TERRAFORM_EXTRA_VARS += terraform_gce_credentials=$(subst ",,$(CONFIG_TERRAFORM_ endif ifeq (y,$(CONFIG_TERRAFORM_OCI)) -ifeq (y, $(CONFIG_TERRAFORM_OCI_ASSIGN_PUBLIC_IP)) -TERRAFORM_EXTRA_VARS += terraform_oci_assign_public_ip=true -else -TERRAFORM_EXTRA_VARS += terraform_oci_assign_public_ip=false -endif TERRAFORM_EXTRA_VARS += terraform_oci_subnet_ocid=$(subst ",,$(CONFIG_TERRAFORM_OCI_SUBNET_OCID)) endif diff --git a/terraform/oci/kconfigs/Kconfig.network b/terraform/oci/kconfigs/Kconfig.network index ab1914c6f6a6..9dc77a266eb4 100644 --- a/terraform/oci/kconfigs/Kconfig.network +++ b/terraform/oci/kconfigs/Kconfig.network @@ -1,10 +1,11 @@ config TERRAFORM_OCI_ASSIGN_PUBLIC_IP - bool "Assign public IP address to the cloud instance" + bool "Assign public IP address to each instance" + output yaml default y help - Select this field if public IP address has to be assigned to - the cloud instance. Otherwise a public IP address is - assigned. + Enable this setting if a public IP address should be + assigned to each instance. Leave it unset to prevent your + instances from being accessible on the public internet. config TERRAFORM_OCI_SUBNET_OCID string "OCI Subnet OCID" From patchwork Tue Apr 1 00:59:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034274 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 A088A3C3C for ; Tue, 1 Apr 2025 01:00:22 +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=1743469222; cv=none; b=YtmX8mVuM8dJuur1uwEB7mnsisIMteHnR3TtwZBxGvRQ12GAOkMDsN+zZxxa4TXMmfAlk/4hYKk8RbDcRDarpEQYoyURgvcSlga0SW2wKnkXYuEqtLbthpmn6Gdhr83coAcnuJyBK3cBFvopwAxVkzxwOfwyHBcLQEnlxrc0JuQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469222; c=relaxed/simple; bh=dGxk5jZJ2So21meDBr1lqYxtrX3gZOIkGG7/lOfFzQQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lmileIEGex2Hhgfx3ru20ltzJDbOGzQItGzuJaGW3DiJfEcuQq84c+D1vfE0PDYgReqvJxVxkcvVhbQscfTjUlE+/fFjT9vEbPZVSJI4LZ4kA+c2BfCpWdQ1e0XLU8JOgORq8lkkgQ9kP5OzGbzC3Wiwx7SNX63/hh2rKwPAl+U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TI12sLX9; 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="TI12sLX9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 244A7C4CEEB; Tue, 1 Apr 2025 01:00:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469222; bh=dGxk5jZJ2So21meDBr1lqYxtrX3gZOIkGG7/lOfFzQQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TI12sLX9jraWMLhI/sImFumaBtNp53c8sXi0+rJhzGHAd+3IBvWlpM5/oiDUH5/1v NfBMlzWMBZJ1y7HdIYL+leBdDRmuUhlp36H2SOuKJTht70jjoZWwoMbLdd0M7iFt2E ZOEF42jCBsEucZBYkUKqxmO58FeEjZO+B94V5zz5tVH4NTTfcxjRBcMtBqX3DwuZyP a5zdVnF1y3qGzOb6SB/Ffjt8QLFIBKnbkJIdba1sVyOuzFmtwWufx+Oq2EebK0+RS3 WTWcxDD7f3VyyDcj4xP2RcVUtI24aEjQfWRkozsS3m8E0dvICRhcO9zTWcWAf5/hrK bfJSQ719uQIvA== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 25/31] terraform/OCI: Use "output yaml" for the subnet_ocid setting Date: Mon, 31 Mar 2025 20:59:54 -0400 Message-ID: <20250401010000.764234-26-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 Refactor: Remove the line in terraform.Makefile that sets "terraform_oci_subnet_ocid" and just pass it directly from Kconfig via an "output yaml" directive. As an additional clean up, update the help text. Signed-off-by: Chuck Lever --- scripts/terraform.Makefile | 4 ---- terraform/oci/kconfigs/Kconfig.network | 11 ++++++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile index 99aadfc51fff..8b9bf984fc42 100644 --- a/scripts/terraform.Makefile +++ b/scripts/terraform.Makefile @@ -94,10 +94,6 @@ TERRAFORM_EXTRA_VARS += terraform_gce_image_name=$(subst ",,$(CONFIG_TERRAFORM_G TERRAFORM_EXTRA_VARS += terraform_gce_credentials=$(subst ",,$(CONFIG_TERRAFORM_GCE_JSON_CREDENTIALS_PATH)) endif -ifeq (y,$(CONFIG_TERRAFORM_OCI)) -TERRAFORM_EXTRA_VARS += terraform_oci_subnet_ocid=$(subst ",,$(CONFIG_TERRAFORM_OCI_SUBNET_OCID)) -endif - ifeq (y,$(CONFIG_TERRAFORM_OPENSTACK)) TERRAFORM_EXTRA_VARS += terraform_openstack_cloud_name=$(subst ",,$(CONFIG_TERRAFORM_TERRAFORM_OPENSTACK_CLOUD_NAME)) TERRAFORM_EXTRA_VARS += terraform_openstack_instance_prefix=$(subst ",,$(CONFIG_TERRAFORM_TERRAFORM_OPENSTACK_INSTANCE_PREFIX)) diff --git a/terraform/oci/kconfigs/Kconfig.network b/terraform/oci/kconfigs/Kconfig.network index 9dc77a266eb4..22d1e5ad3062 100644 --- a/terraform/oci/kconfigs/Kconfig.network +++ b/terraform/oci/kconfigs/Kconfig.network @@ -9,7 +9,12 @@ config TERRAFORM_OCI_ASSIGN_PUBLIC_IP config TERRAFORM_OCI_SUBNET_OCID string "OCI Subnet OCID" + output yaml help - The OCI ID of the subnet. - Read this: - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm + If there is a long-lived VNC and subnet already available + to which to attach kdevops compute instances, specify the + OCID of this subnet via this option. + + kdevops does not manage this resource. Before running + "make bringup", the subnet must already exist and your OCI + user must have permission to attach to it. From patchwork Tue Apr 1 00:59:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034275 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 4483C3C3C for ; Tue, 1 Apr 2025 01:00:23 +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=1743469223; cv=none; b=VTGNPOwk2NJMNxPcmJ7lzhNY/SRwceC/0K5IVenvtYf2WZaZ0TNsT8stJtr0PaOPPcYkXKiZgfYPBGwzH1svmE/ZA8M0HiiHEb4QrOGN3gavl+yhRSZDK3lZlSi5hd7jDOP8e9iELdumHlcj57JXFqnxSaeSmzuRw8fZ8HSd8kY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469223; c=relaxed/simple; bh=Fb+ESY58OyfFJPw1Nhz+9avMvuC5QXNhZJYSJ9BtRXQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=k04JNdAL+vJcpo1hdeyR/y9gzpkc/ZltCa8V+Lono7RLfohAf+G7FKxHqJ3VsLLl9Qz3dx2N+sS8yjewVjx38Ydy380sWDZJEXCeHRWEzBbCIJesKjvNCEkDeIRtxWn8ORFPgsjF4BKpJ8epNBPr5lXMf4+H2Llt32OjQ0bZ6sU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=M6G+ljeD; 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="M6G+ljeD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B88E1C4CEE5; Tue, 1 Apr 2025 01:00:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469223; bh=Fb+ESY58OyfFJPw1Nhz+9avMvuC5QXNhZJYSJ9BtRXQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M6G+ljeDLbNZlmSchauzjbO6io4paDBw6/nEEfU77eeNBNb4xrlgdkhul1FBKxPs0 LFPw87WYlAK0xGIsti4fZ0MqmVvteKHbV2BqgEH2+ez1EkVly1SNN9Z+25N6Ngp3rq OQ3Cf7pxq1yK4PMQDzdRDZe3drf0i0L+pRdqM2MSKwfQj/rVdJq3QbSGArN6N47Sjq FGT5cImAJzuXCQQrZnWIQL15e9NfhMQ2mMBEQPDHqY5EKRo4RJ+ctIik9TBo2gRQrr 5dRirZByFqA1CM4FPDkl1jCjYlDx2daog5v+JRbsui2fmrkdfACJDteQ3ryuHaqhnH 2gUeG0PkciGzg== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 26/31] terraform/OCI: Add a default VCN Date: Mon, 31 Mar 2025 20:59:55 -0400 Message-ID: <20250401010000.764234-27-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 The kdevops set-up for other cloud providers assumes that kdevops will provision a VCN/subnet for use during test runs. OCI does not have that option; it assumes that a long-lived subnet already exists to which kdevops instances should be attached. In a moment I will introduced a Kconfig option to use network resources that kdevops manages instead of a pre-existing subnet. This patch adds those resources, but does not yet use them, so that the new network resource configuration can be reviewed easily. Signed-off-by: Chuck Lever --- terraform/oci/main.tf | 112 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/terraform/oci/main.tf b/terraform/oci/main.tf index f6596a104c51..250c3b722537 100644 --- a/terraform/oci/main.tf +++ b/terraform/oci/main.tf @@ -51,3 +51,115 @@ module "volumes" { vol_volume_count = var.oci_volumes_per_instance vol_volume_size = var.oci_volumes_size } + +resource "oci_core_vcn" "kdevops_vcn" { + cidr_blocks = [ + "10.0.0.0/16", + ] + compartment_id = data.oci_identity_compartments.kdevops_compartment.compartments[0].id + display_name = "kdevops VCN" + dns_label = "kdevops" + is_ipv6enabled = false +} + +resource "oci_core_internet_gateway" "kdevops_internet_gateway" { + compartment_id = data.oci_identity_compartments.kdevops_compartment.compartments[0].id + display_name = "kdevops internet gateway" + vcn_id = oci_core_vcn.kdevops_vcn.id +} + +resource "oci_core_dhcp_options" "kdevops_dhcp_options" { + compartment_id = data.oci_identity_compartments.kdevops_compartment.compartments[0].id + display_name = "kdevops dhcp options" + vcn_id = oci_core_vcn.kdevops_vcn.id + + options { + type = "DomainNameServer" + server_type = "VcnLocalPlusInternet" + } + options { + type = "SearchDomain" + search_domain_names = ["kdevops.oraclevcn.com"] + } +} + +resource "oci_core_route_table" "kdevops_route_table" { + compartment_id = data.oci_identity_compartments.kdevops_compartment.compartments[0].id + display_name = "kdevops route table" + vcn_id = oci_core_vcn.kdevops_vcn.id + route_rules { + destination = "0.0.0.0/0" + destination_type = "CIDR_BLOCK" + network_entity_id = oci_core_internet_gateway.kdevops_internet_gateway.id + } +} + +resource "oci_core_security_list" "kdevops_security_list" { + compartment_id = data.oci_identity_compartments.kdevops_compartment.compartments[0].id + display_name = "kdevops security list" + vcn_id = oci_core_vcn.kdevops_vcn.id + + egress_security_rules { + description = "Allow all outbound traffic" + destination = "0.0.0.0/0" + destination_type = "CIDR_BLOCK" + protocol = "all" + stateless = false + } + + ingress_security_rules { + description = "Enable Path MTU Discovery to work" + icmp_options { + code = 4 + type = 3 + } + protocol = 1 + source = "0.0.0.0/0" + source_type = "CIDR_BLOCK" + stateless = false + } + ingress_security_rules { + description = "Allow applications within VCN to fail fast" + icmp_options { + type = 3 + } + protocol = 1 + source = "10.0.0.0/16" + source_type = "CIDR_BLOCK" + stateless = false + } + ingress_security_rules { + description = "Enable instance management via Ansible" + protocol = 6 + source = "0.0.0.0/0" + source_type = "CIDR_BLOCK" + stateless = false + tcp_options { + min = 22 + max = 22 + } + } + ingress_security_rules { + description = "Allow VCN-local TCP traffic for ports: all" + protocol = 6 + source = "10.0.0.0/16" + source_type = "CIDR_BLOCK" + stateless = false + tcp_options { + min = 1 + max = 65535 + } + } +} + +resource "oci_core_subnet" "kdevops_subnet" { + availability_domain = data.oci_identity_availability_domain.kdevops_av_domain.name + cidr_block = "10.0.0.0/24" + compartment_id = data.oci_identity_compartments.kdevops_compartment.compartments[0].id + dhcp_options_id = oci_core_dhcp_options.kdevops_dhcp_options.id + dns_label = "runners" + display_name = "kdevops subnet" + route_table_id = oci_core_route_table.kdevops_route_table.id + security_list_ids = ["${oci_core_security_list.kdevops_security_list.id}"] + vcn_id = oci_core_vcn.kdevops_vcn.id +} From patchwork Tue Apr 1 00:59:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034276 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 3282D22612 for ; Tue, 1 Apr 2025 01:00:23 +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=1743469224; cv=none; b=lTT/QtqJmPOsBodeIDlCI7894mqHFNAneuUVfG96foVri1wou3l6Utookaix4Now8VVotLeA12GYQGW2S6h8otuF0lCL/mFxOHrgau/QqQO0WVozewN5KU80V+fIajdpyfbeGj9GYJLVhMbVXsU42uKNxw1NC9gFIByFgbEKg3A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469224; c=relaxed/simple; bh=vV8YY/4BT5TjDKF8laF5R0FXfEfqcdWtmRq1klkE8BE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N79A8DyrX725gRQcKnIR+xHTtr0NqfM77buxX8XOunzGe5JvVTjFENfE2W14COH2sTju5Qzed7PiR3HyyC7+RFXo2TdLT/Ixj9odIw7WSVdjCbqwdVYcsMeqzsZbGh4JM30/8mL03slaiZ0Q99TXvW00vK8/B7V9BPjL8ANvPU0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FnvsWj6S; 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="FnvsWj6S" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 57E20C4CEEB; Tue, 1 Apr 2025 01:00:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469223; bh=vV8YY/4BT5TjDKF8laF5R0FXfEfqcdWtmRq1klkE8BE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FnvsWj6SsgCE1ZqyeWeaDAyNmkzTcZVbcZ90ZP7gyZxW+nHcr7y7fl9iM0OjU27Fc 1BHrlbcRB0E2N/iboxgArV4g/PaUjojN5BXXDg0KV8AddLGxNkb7Ye8r5qS0auDgdZ SjUJi6tH5V640UHpLhxhjQjaT6PGg+j6V3OUSYCznsdGQkjkKa4f5G/Iuxl9jaMRXm IaeCm//Eh12hvNXn5BhHNiVkUUhGdTxJoByZpN/MaOOuyEt7Tj8dI32J6HvnOyhycm 0yOFTFFLwdfz8bZM0Peaw1XQD1e3zffq5PgaxsDcIeaKcLM5Ib/whkwFzUb8le3Egq 2H0hLOE4imgkg== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 27/31] terraform/OCI: Add a Kconfig switch to create a VCN on the fly Date: Mon, 31 Mar 2025 20:59:56 -0400 Message-ID: <20250401010000.764234-28-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 Make it simpler to use OCI: create a kdevops VCN if there isn't already a persistent VCN to use. Signed-off-by: Chuck Lever --- playbooks/roles/gen_tfvars/defaults/main.yml | 1 + .../templates/oci/terraform.tfvars.j2 | 3 ++ terraform/oci/kconfigs/Kconfig.network | 19 +++++++++++ terraform/oci/main.tf | 32 +++++++++++++------ terraform/oci/vars.tf | 6 ++++ 5 files changed, 51 insertions(+), 10 deletions(-) diff --git a/playbooks/roles/gen_tfvars/defaults/main.yml b/playbooks/roles/gen_tfvars/defaults/main.yml index b6caadcb7e0c..24b932974f36 100644 --- a/playbooks/roles/gen_tfvars/defaults/main.yml +++ b/playbooks/roles/gen_tfvars/defaults/main.yml @@ -49,6 +49,7 @@ terraform_gce_image_name: "invalid" terraform_gce_credentials: "invalid" terraform_oci_assign_public_ip: false +terraform_oci_use_existing_vcn: false terraform_openstack_cloud_name: "invalid" terraform_openstack_instance_prefix: "invalid" diff --git a/playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2 b/playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2 index 192d72ff32a9..56402d13630b 100644 --- a/playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2 +++ b/playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2 @@ -14,7 +14,10 @@ oci_instance_flex_memory_in_gbs = {{ terraform_oci_instance_flex_memory_in_gbs } {% endif %} oci_os_image_ocid = "{{ terraform_oci_os_image_ocid }}" oci_assign_public_ip = {{ terraform_oci_assign_public_ip | lower }} +oci_use_existing_vcn = {{ terraform_oci_use_existing_vcn | lower }} +{% if terraform_oci_use_existing_vcn %} oci_subnet_ocid = "{{ terraform_oci_subnet_ocid }}" +{% endif %} oci_volumes_per_instance = {{ terraform_oci_volumes_per_instance }} oci_volumes_size = {{ terraform_oci_volumes_size }} oci_data_volume_device_file_name = "{{ terraform_oci_data_volume_device_file_name }}" diff --git a/terraform/oci/kconfigs/Kconfig.network b/terraform/oci/kconfigs/Kconfig.network index 22d1e5ad3062..8130ca04de6d 100644 --- a/terraform/oci/kconfigs/Kconfig.network +++ b/terraform/oci/kconfigs/Kconfig.network @@ -7,6 +7,23 @@ config TERRAFORM_OCI_ASSIGN_PUBLIC_IP assigned to each instance. Leave it unset to prevent your instances from being accessible on the public internet. +config TERRAFORM_OCI_USE_EXISTING_VCN + bool "Attach instances to an existing VCN" + output yaml + default y + help + If your tenancy administrator prefers to create and secure + the network resources used within a compartment, or your + tenancy has special networking requirements, enable this + option. Then enter the OCID of the existing subnet in the + TERRAFORM_OCI_SUBNET_OCID option below. kdevops will join + its compute instances to that subnet. + + Disable this option if you'd like kdevops to create a + secure VPN and subnet automatically. + +if TERRAFORM_OCI_USE_EXISTING_VCN + config TERRAFORM_OCI_SUBNET_OCID string "OCI Subnet OCID" output yaml @@ -18,3 +35,5 @@ config TERRAFORM_OCI_SUBNET_OCID kdevops does not manage this resource. Before running "make bringup", the subnet must already exist and your OCI user must have permission to attach to it. + +endif # TERRAFORM_OCI_USE_EXISTING_VCN diff --git a/terraform/oci/main.tf b/terraform/oci/main.tf index 250c3b722537..20aa7c5a612b 100644 --- a/terraform/oci/main.tf +++ b/terraform/oci/main.tf @@ -30,7 +30,7 @@ resource "oci_core_instance" "kdevops_instance" { create_vnic_details { assign_public_ip = var.oci_assign_public_ip - subnet_id = var.oci_subnet_ocid + subnet_id = var.oci_use_existing_vcn ? var.oci_subnet_ocid : one(oci_core_subnet.kdevops_subnet[*].id) } metadata = { @@ -53,6 +53,8 @@ module "volumes" { } resource "oci_core_vcn" "kdevops_vcn" { + count = var.oci_use_existing_vcn ? 0 : 1 + cidr_blocks = [ "10.0.0.0/16", ] @@ -63,15 +65,19 @@ resource "oci_core_vcn" "kdevops_vcn" { } resource "oci_core_internet_gateway" "kdevops_internet_gateway" { + count = var.oci_use_existing_vcn ? 0 : 1 + compartment_id = data.oci_identity_compartments.kdevops_compartment.compartments[0].id display_name = "kdevops internet gateway" - vcn_id = oci_core_vcn.kdevops_vcn.id + vcn_id = one(oci_core_vcn.kdevops_vcn[*].id) } resource "oci_core_dhcp_options" "kdevops_dhcp_options" { + count = var.oci_use_existing_vcn ? 0 : 1 + compartment_id = data.oci_identity_compartments.kdevops_compartment.compartments[0].id display_name = "kdevops dhcp options" - vcn_id = oci_core_vcn.kdevops_vcn.id + vcn_id = one(oci_core_vcn.kdevops_vcn[*].id) options { type = "DomainNameServer" @@ -84,20 +90,24 @@ resource "oci_core_dhcp_options" "kdevops_dhcp_options" { } resource "oci_core_route_table" "kdevops_route_table" { + count = var.oci_use_existing_vcn ? 0 : 1 + compartment_id = data.oci_identity_compartments.kdevops_compartment.compartments[0].id display_name = "kdevops route table" - vcn_id = oci_core_vcn.kdevops_vcn.id + vcn_id = one(oci_core_vcn.kdevops_vcn[*].id) route_rules { destination = "0.0.0.0/0" destination_type = "CIDR_BLOCK" - network_entity_id = oci_core_internet_gateway.kdevops_internet_gateway.id + network_entity_id = one(oci_core_internet_gateway.kdevops_internet_gateway[*].id) } } resource "oci_core_security_list" "kdevops_security_list" { + count = var.oci_use_existing_vcn ? 0 : 1 + compartment_id = data.oci_identity_compartments.kdevops_compartment.compartments[0].id display_name = "kdevops security list" - vcn_id = oci_core_vcn.kdevops_vcn.id + vcn_id = one(oci_core_vcn.kdevops_vcn[*].id) egress_security_rules { description = "Allow all outbound traffic" @@ -153,13 +163,15 @@ resource "oci_core_security_list" "kdevops_security_list" { } resource "oci_core_subnet" "kdevops_subnet" { + count = var.oci_use_existing_vcn ? 0 : 1 + availability_domain = data.oci_identity_availability_domain.kdevops_av_domain.name cidr_block = "10.0.0.0/24" compartment_id = data.oci_identity_compartments.kdevops_compartment.compartments[0].id - dhcp_options_id = oci_core_dhcp_options.kdevops_dhcp_options.id + dhcp_options_id = one(oci_core_dhcp_options.kdevops_dhcp_options[*].id) dns_label = "runners" display_name = "kdevops subnet" - route_table_id = oci_core_route_table.kdevops_route_table.id - security_list_ids = ["${oci_core_security_list.kdevops_security_list.id}"] - vcn_id = oci_core_vcn.kdevops_vcn.id + route_table_id = one(oci_core_route_table.kdevops_route_table[*].id) + security_list_ids = ["${one(oci_core_security_list.kdevops_security_list[*].id)}"] + vcn_id = one(oci_core_vcn.kdevops_vcn[*].id) } diff --git a/terraform/oci/vars.tf b/terraform/oci/vars.tf index 7c19720bebc2..225ebdf51648 100644 --- a/terraform/oci/vars.tf +++ b/terraform/oci/vars.tf @@ -61,10 +61,16 @@ variable "oci_assign_public_ip" { } variable "oci_subnet_ocid" { + default = null description = "Subnet OCID" type = string } +variable "oci_use_existing_vcn" { + description = "Use a pre-existing VCN" + type = bool +} + variable "oci_volumes_per_instance" { description = "The count of additional block volumes per instance" type = number From patchwork Tue Apr 1 00:59:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034277 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 6C6FC3C3C for ; Tue, 1 Apr 2025 01:00:24 +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=1743469224; cv=none; b=b6yKHsrGmAHegfRBMEoPexpgQ4cDIOTj4qkWGp1J2UABpZoRuErXaTYY7DcEVZ07bNETH1Zku0J6X/CRZXaw4GPbjpsKb3GYdpdnzwtF6YLRI3ZpWG9dhFQn+nq+FfO1sAW76aHmpnSjadWoksex+q/5eRG2bCzMkCBK/26ee44= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469224; c=relaxed/simple; bh=WegwFXCkR8Eo9yTxAf4I1pVJkSpHkWG/EhKrGf0RI2I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=o6g9XwtduB55+U6fX4bbWweEhztCRiq3CPs1DXPzt/kUgO+DpqlDq+X8LiADHvO+qpYBMixO3vSm/OrmZg8aObkhNP3oO72n2Gt2ZMRi1B/SdC5t1JxPeSBBdfF6DNbIKCfOYwjs6PGevkNEqRaWhpT/EgKvWLNqn4tGcyA2Xsk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bUFtaWNH; 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="bUFtaWNH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E98AFC4CEE3; Tue, 1 Apr 2025 01:00:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469224; bh=WegwFXCkR8Eo9yTxAf4I1pVJkSpHkWG/EhKrGf0RI2I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bUFtaWNH5oQg1TDdlqShnkygEgRg2mnBNAtjB/CSbX56YmVLSEZoCCzxC3JaLRUtI xndHVvw48lDBJj2N7rTyNY0cLiZDkLVnL6WN+5BeS+Y5KVHTY2ySHG5r6tkA+juntU GdN8Y7ZmkAcTHqTljOYV7FdFeMQ+MED48aDEOc0w9fbF5soZ0we2ZNe6Q1pAYYA9Rp 13P24c/ApYVVHN1DrgqCYhfytWZWJDy2IMyWdVfHpKCe8uk+Nw/1iPEoGhm+uDlNpC jNnfc1PxnqkzbfY+7kRHKbcVEQpzMf1AtWufQVYq+UD/hj9i3cJgPCdQ9VbkdTJoG9 kz/u1C0sQzs9Q== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 28/31] terraform/OCI: Run "terraform fmt" on provider.tf Date: Mon, 31 Mar 2025 20:59:57 -0400 Message-ID: <20250401010000.764234-29-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 And alphabetize. Signed-off-by: Chuck Lever --- terraform/oci/provider.tf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/terraform/oci/provider.tf b/terraform/oci/provider.tf index 80361d3ac562..5bea98de7f4f 100644 --- a/terraform/oci/provider.tf +++ b/terraform/oci/provider.tf @@ -2,9 +2,9 @@ terraform { } provider "oci" { - tenancy_ocid = var.oci_tenancy_ocid - user_ocid = var.oci_user_ocid - private_key_path = var.oci_user_private_key_path - fingerprint = var.oci_user_fingerprint - region = var.oci_region + fingerprint = var.oci_user_fingerprint + private_key_path = var.oci_user_private_key_path + region = var.oci_region + tenancy_ocid = var.oci_tenancy_ocid + user_ocid = var.oci_user_ocid } From patchwork Tue Apr 1 00:59:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034278 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 0CAFC3C3C for ; Tue, 1 Apr 2025 01:00:25 +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=1743469225; cv=none; b=iNL24CP8fiSZ2JxydJt+619tOnc0OST6lRQOHUy6IXLg3kMJO9gYkIET6e+7pQzAV+6Lwgh1z3zkFrGw0JVjahIrqmjtojD02ANO3PFXbS4De32xHykDDDbGt9O/tF3vEDNWAkqE5ql7wtX8k+NDkZ50WunYiCxI1cdzRJSrFu0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469225; c=relaxed/simple; bh=OMDUP0GxfQ7aSUqwQdHH0su9vwefadpqUOe7S7dm3zE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IZC5mV8FSMEdBuvwidCvjtQjH4UbD15SbzxTzkfkg3OMngYo2cGElYYagAKrl9dNRtIODWBC9FifeqR46lpg9L/QhY5o3SbCsLDoJFRnCslv/F05YlmCDq57jbkI1R2IfD795Fym0JJJh489zuYdewLCqUbcFSJmfn+7gblvD+s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tsvrSjJt; 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="tsvrSjJt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 86052C4CEEB; Tue, 1 Apr 2025 01:00:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469224; bh=OMDUP0GxfQ7aSUqwQdHH0su9vwefadpqUOe7S7dm3zE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tsvrSjJtsmzyEq+3I4lRnoobjjSeC2PEY+p2+lGqq0DiJYh4A0silKLufDOKrLGGI OyvFGJ3P5bH29446bqeSjAezrpJ+B02t9RXS8m6I2WWkLkXp3db7scEJjhGA8E07M4 KaDhMSHRA3P6+uSv6mwN6QQsEFgMC+IwoymCT1iLbZYDB0/+tws3zY9L46ku+zVVhf w7L6IP9izSCFzM5eu3gsW+wKoS1s/XGTZBXb3kgSklwtnA5MVrlVHCPtzkm6W3h4uu DUGK4FtdGV9NyBbGLBGGWqYHFGWAdKmeYK9l6CmXnjaXUi7BrDvbqRQgjmD1nDVRm7 Q1nGFwh1DroMw== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 29/31] terraform/OCI: Run "terraform fmt" on main.tf Date: Mon, 31 Mar 2025 20:59:58 -0400 Message-ID: <20250401010000.764234-30-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 Signed-off-by: Chuck Lever --- terraform/oci/main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/terraform/oci/main.tf b/terraform/oci/main.tf index 20aa7c5a612b..d231f2225e5d 100644 --- a/terraform/oci/main.tf +++ b/terraform/oci/main.tf @@ -19,10 +19,10 @@ resource "oci_core_instance" "kdevops_instance" { shape = var.oci_shape shape_config { memory_in_gbs = var.oci_instance_flex_memory_in_gbs - ocpus = var.oci_instance_flex_ocpus + ocpus = var.oci_instance_flex_ocpus } source_details { - source_id = var.oci_os_image_ocid + source_id = var.oci_os_image_ocid source_type = "image" } From patchwork Tue Apr 1 00:59:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034279 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 A35E33C3C for ; Tue, 1 Apr 2025 01:00:25 +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=1743469225; cv=none; b=PhxKKmao3llY+dIoBy8/LMtwMa0y2jTmwf49kGHGxq6sHYBNhWKwRGh1c++ovhDlwzzV/xj8sBtKCXr2AMGzaqP+RyMCmj35cy75h4bw8C38mfMoFSugcM0fhL03/GdReCJM39s5YN5LMSIAmoTZkcfjJALGvtfWOPptBfmuEZ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469225; c=relaxed/simple; bh=bN5+0N0BOHhBT8n+dGoWQFeGZmNRWbctS1Yqa8sOh3c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IIi48LFXFgvMkQhkwlwXRdPSK+B+tTNub7m6UYfMIJ2oba4TQ/jVd2RAEXjUviUUiMTMcviBnhglU6yRhXSAIZFc7Y33HMqdtbHHdZBSwoZJPnBsGmCjfbqH45aVP8m7os2AwryW7HfQ+SHXNXuVotogWlHHMSQVGY5h97K3MAo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZTQDmYto; 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="ZTQDmYto" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2917EC4CEEA; Tue, 1 Apr 2025 01:00:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469225; bh=bN5+0N0BOHhBT8n+dGoWQFeGZmNRWbctS1Yqa8sOh3c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZTQDmYto9Ote9FYkwiKl2GwsE88zPqSDTrCgsAyLnXW9+03ZUX9GSxDCg+NXksZP5 5BaA/F2p8Ih9BY2H2AhShc8V063s9VJloOYNt4vyRdyzlZtLS68/OBKYCZoAk/0bZ6 uW4J+xwt3JSah2oR/hpLVJeb7l2z0XlUMcJKI5CoidkGrPiUSUascf8Jekg0IzqgIO LvU25hQOH3EBlHLDPpCA3ThjaRRdp8D5F7Y+DnBgcgXalICDCWIM8agrLEGKvXlQii fzn84fBl9cz6auNa9oJ36N65mYnQzP/kZfq0BfLkKQnxP5i0O98bLnJkaVSEdAl++m XovAhxzumOKMw== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 30/31] terraform/OCI: Nit: alphabetize vars.tf Date: Mon, 31 Mar 2025 20:59:59 -0400 Message-ID: <20250401010000.764234-31-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 It's getting to be a large file. I find alphabetic order makes it quicker to eyeball. Signed-off-by: Chuck Lever --- terraform/oci/vars.tf | 96 +++++++++++++++++++++---------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/terraform/oci/vars.tf b/terraform/oci/vars.tf index 225ebdf51648..f2b7a6e69000 100644 --- a/terraform/oci/vars.tf +++ b/terraform/oci/vars.tf @@ -3,21 +3,69 @@ variable "oci_ad_number" { type = number } +variable "oci_assign_public_ip" { + description = "Assign public IP to the instance" + type = bool +} + variable "oci_compartment_name" { description = "Name of compartment in which to create resources" type = string } +variable "oci_data_volume_device_file_name" { + description = "Data volume's device file name" + type = string +} + +variable "oci_instance_flex_memory_in_gbs" { + default = null + description = "The total amount of memory available to the instance, in gigabytes." + type = number +} + +variable "oci_instance_flex_ocpus" { + default = null + description = "The total number of OCPUs available to the instance." + type = number +} + +variable "oci_os_image_ocid" { + description = "OCID of OS image" + type = string +} + variable "oci_region" { description = "An OCI region" type = string } +variable "oci_shape" { + description = "Shape name" + type = string +} + +variable "oci_sparse_volume_device_file_name" { + description = "Sparse volume's device file name" + type = string +} + +variable "oci_subnet_ocid" { + default = null + description = "Subnet OCID" + type = string +} + variable "oci_tenancy_ocid" { description = "OCID of your tenancy" type = string } +variable "oci_user_fingerprint" { + description = "Fingerprint for the key pair being used" + type = string +} + variable "oci_user_ocid" { description = "OCID of the user calling the API" type = string @@ -28,44 +76,6 @@ variable "oci_user_private_key_path" { type = string } -variable "oci_user_fingerprint" { - description = "Fingerprint for the key pair being used" - type = string -} - -variable "oci_shape" { - description = "Shape name" - type = string -} - -variable "oci_instance_flex_ocpus" { - default = null - description = "The total number of OCPUs available to the instance." - type = number -} - -variable "oci_instance_flex_memory_in_gbs" { - default = null - description = "The total amount of memory available to the instance, in gigabytes." - type = number -} - -variable "oci_os_image_ocid" { - description = "OCID of OS image" - type = string -} - -variable "oci_assign_public_ip" { - description = "Assign public IP to the instance" - type = bool -} - -variable "oci_subnet_ocid" { - default = null - description = "Subnet OCID" - type = string -} - variable "oci_use_existing_vcn" { description = "Use a pre-existing VCN" type = bool @@ -80,13 +90,3 @@ variable "oci_volumes_size" { description = "The size of additional block volumes, in gibibytes" type = number } - -variable "oci_data_volume_device_file_name" { - description = "Data volume's device file name" - type = string -} - -variable "oci_sparse_volume_device_file_name" { - description = "Sparse volume's device file name" - type = string -} From patchwork Tue Apr 1 01:00:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034280 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 B79732E3371 for ; Tue, 1 Apr 2025 01:00:26 +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=1743469226; cv=none; b=ikGacyYi2cFAIEr/8NheKYo85vvTDyzk6ibmatIxJWBaunhWMI2efCx3AC7eG6R5rpktCza/IVQHayXdmA+8engjf0YZPlEz16/z1MAzHBoTUqEm1BO+0V6Ih1A0MgYdDTG2TTM3RsEyfM95BhFzAiP7F8zV7LFLU8xoiwq+Gaw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469226; c=relaxed/simple; bh=1HOw3d3X0jCKd5XoBdG/pEzLTbYlGcW1LJGzPPCuYwg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ikvloelleZ3w3BsU+4enNmkIMKgNTQc8245Yj2dInjAC6cKx1CZ+68oY2oBX7HT4kcD38OEGlnBqVe6MmZPSkTkJrlquTzTUyc5nvgzEIp3PcRpXeZJ1iVqBbtzokCFC/+5BV1FlmA9fG+9c6ilpQwrZT/JfdRCd5LmZ+bEKZZI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=omvvQvbg; 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="omvvQvbg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BFC0CC4CEE3; Tue, 1 Apr 2025 01:00:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469226; bh=1HOw3d3X0jCKd5XoBdG/pEzLTbYlGcW1LJGzPPCuYwg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=omvvQvbgYdzrKFfAY3pCZJSjaCYfCsKSriVuVkZi+3t8sFFtbOOJ7EVTaOVmqtiwN 3FKUPnJcsh+l18hGrhEp2v+YtISkR2/BYVKKDuf4dNx+x18w72cDMKKmKt/IfiQ5H/ yszZvVsXRNYwgWSdoX4dU0N0yjYkypmRoKyLAviN5UojjwS8lfv9n6C5ytVcYENWnd WeUFfEKtkUL2KxqyJ0d7Y2d9PLhw+Ia+sBkxTTwc2FZOS6ihN6xfCd6mcQbL/Jmb4D vz6wzRwu0Hzfyv7i0x+eSSGLrFrM7ljeI/0PSwhMku7OZQChS9NwiNAmqEm1V7Cj9B 4QGtsa31++D7g== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 31/31] terraform/OCI: Update the OCI section of docs/kdevops-terraform.md Date: Mon, 31 Mar 2025 21:00:00 -0400 Message-ID: <20250401010000.764234-32-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 Update documentation URLs, focus on the basics. Signed-off-by: Chuck Lever --- docs/kdevops-terraform.md | 117 ++++++++++++-------------------------- 1 file changed, 35 insertions(+), 82 deletions(-) diff --git a/docs/kdevops-terraform.md b/docs/kdevops-terraform.md index 5e5107fef73e..34ac1a19eff1 100644 --- a/docs/kdevops-terraform.md +++ b/docs/kdevops-terraform.md @@ -298,86 +298,39 @@ https://www.terraform.io/docs/providers/google/index.html https://cloud.google.com/iam/docs/granting-roles-to-service-accounts#granting_access_to_a_service_account_for_a_resource ### OCI - Oracle Cloud Infrastructure -OCI documentation is located at -1. https://docs.oracle.com/en-us/iaas/Content/home.htm -2. https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraform.htm -The following is a list of OCI specific configuration variables that the user -needs to provide values (through `make menuconfig` interface). - 1. `CONFIG_TERRAFORM_SSH_CONFIG_USER` - - User name used for the logging into the cloud instance. - - Please use, - - `opc` for Oracle Linux. - - `ubuntu` for Ubuntu Linux - 2. `CONFIG_TERRAFORM_SSH_CONFIG_PUBKEY_FILE` - - Path to user's ssh public key (e.g. `~/.ssh/id_rsa.pub`). - - This key will be copied over to the cloud instance during its - creation. - 3. `CONFIG_TERRAFORM_OCI_REGION` - - String representing the name of the region (e.g. `us-ashburn-1`). - - https://docs.oracle.com/en-us/iaas/Content/anomaly/using/regions.htm - - List of the regions can be found at - https://docs.oracle.com/en-us/iaas/Content/General/Concepts/regions.htm - 4. `CONFIG_TERRAFORM_OCI_TENANCY_OCID` - - OCID of the tenancy being used. - - In order to obtain the OCID, Please refer to - https://docs.oracle.com/en-us/iaas/Content/GSG/Tasks/contactingsupport_topic-Finding_Your_Tenancy_OCID_Oracle_Cloud_Identifier.htm - 5. `CONFIG_TERRAFORM_OCI_USER_OCID` - - OCID of the user. - - In order to obtain the OCID, Please refer to - https://docs.oracle.com/en-us/iaas/Content/API/Concepts/apisigningkey.htm#five - 6. `CONFIG_TERRAFORM_OCI_USER_PRIVATE_KEY_PATH` - - Path to API private key. - - Documentation - - Generating API keys. - Refer to section `Generating an API Signing Key (Linux and Mac OS X)` - at - https://docs.oracle.com/en-us/iaas/Content/API/Concepts/apisigningkey.htm - - Uploading Public API key. - Refer to section `How to Upload the Public Key` at - https://docs.oracle.com/en-us/iaas/Content/API/Concepts/apisigningkey.htm - - Video: https://www.youtube.com/watch?v=LMvYOSkXF1k - 7. `CONFIG_TERRAFORM_OCI_USER_FINGERPRINT` - - Finger print of the API key. - 8. `CONFIG_TERRAFORM_OCI_AVAILABLITY_DOMAIN` ="VkEH:US-ASHBURN-AD-3" - - String specifying the availability domain to use in the region - - Availability domain names can be obtained from the web page used to - launch an cloud instance. - 9. `CONFIG_TERRAFORM_OCI_COMPARTMENT_OCID` - - OCID of the compartment can be obtained by following the instructions - at - https://docs.oracle.com/en-us/iaas/Content/GSG/Tasks/contactingsupport_topic-Finding_the_OCID_of_a_Compartment.htm - 10. `CONFIG_TERRAFORM_OCI_SHAPE`="VM.Standard.E2.8" - - String representing the name of the compute shape to create. - - https://docs.oracle.com/en-us/iaas/Content/Compute/References/computeshapes.htm - 11. `CONFIG_TERRAFORM_OCI_OS_IMAGE_OCID` - - OCID of the OS image to be installed. - - Image's OCID can be obtained by following instructions at - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformbestpractices_topic-Referencing_Images.htm - 12. `CONFIG_TERRAFORM_OCI_SUBNET_OCID` - - OCID of the subnet to be assigned to the cloud instance. - - Overview: - https://docs.oracle.com/en-us/iaas/Content/Network/Tasks/Overview_of_VCNs_and_Subnets.htm - - Instructions on how to get a list of available subnets can be found at - https://docs.oracle.com/en-us/iaas/Content/Network/Tasks/get-subnet.htm - - Click on the hamburger menu provided the right side of a subnet entry - and select `Copy OCID`. - 13. `CONFIG_TERRAFORM_OCI_DATA_VOLUME_DISPLAY_NAME` - - String representing the name for the `data` disk. - - This is used for storing sources and binaries corresponding to Linux - kernel, Fstests & Kdevops. - 14. `CONFIG_TERRAFORM_OCI_DATA_VOLUME_DEVICE_FILE_NAME` - - Device node to be used for `data` disk. - - Please specify `/dev/oracleoci/oraclevdb` as the device file. - 15. `CONFIG_TERRAFORM_OCI_SPARSE_VOLUME_DISPLAY_NAME` - - String representing the name for the `sparse` disk. - - This is used for creating regular files to back loop devices. - 16. `CONFIG_TERRAFORM_OCI_SPARSE_VOLUME_DEVICE_FILE_NAME` - - Device node to be used for `sparse` disk. - - Please specify `/dev/oracleoci/oraclevdc` as the device file. - 17. `CONFIG_TERRAFORM_OCI_INSTANCE_FLEX_OCPUS` - - Number of OCPUs for a flexiable compute shape. - - https://docs.oracle.com/en-us/iaas/Content/Compute/References/computeshapes.htm#flexible - 18. `CONFIG_TERRAFORM_OCI_INSTANCE_FLEX_MEMORY_IN_GBS` - - Amount of RAM in GB for a flexiable compute shape. - - https://docs.oracle.com/en-us/iaas/Content/Compute/References/computeshapes.htm#flexible +kdevops supports using the OCI Public Cloud (OCI). + +#### New To OCI? + +You can find a generic tutorial guide at the following link. You'll +need many (but not all) of these steps to bring up kdevops with OCI. + +https://docs.oracle.com/en-us/iaas/Content/dev/terraform/tutorials/tf-provider.htm + +This explains what an "OCID" is: + +https://docs.oracle.com/en-us/iaas/Content/General/Concepts/identifiers.htm + +#### Quick Start + +To authenticate to the Oracle cloud, kdevops uses the API Key +authentication method, described here: + + https://docs.oracle.com/en-us/iaas/Content/API/Concepts/apisigningkey.htm + +Copy these items into the Kconfig settings under the "Identity & +Access" submenu. Additional guidance is available in the Kconfig +help text in this menu. + +OCI pre-configures an admin ssh user on each instance. Under the +CONFIG_TERRAFORM_SSH_CONFIG_USER option, you need to explicitly set +kconfig's ssh login name depending on which OS image you have +selected: + + - `opc` for Oracle Linux. + - `ubuntu` for Ubuntu Linux + +If your Ansible controller (where you run "make bringup") and your +test instances operate inside the same subnet, you can disable the +TERRAFORM_OCI_ASSIGN_PUBLIC_IP option for better network security.