From: cel@kernel.org
To: <kdevops@lists.linux.dev>
Cc: Chandan Babu R <chandanbabu@kernel.org>,
Chuck Lever <chuck.lever@oracle.com>
Subject: [RFC PATCH 06/31] terraform/OCI: Add a "Storage" Kconfig submenu
Date: Mon, 31 Mar 2025 20:59:35 -0400 [thread overview]
Message-ID: <20250401010000.764234-7-cel@kernel.org> (raw)
In-Reply-To: <20250401010000.764234-1-cel@kernel.org>
From: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
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
--
2.48.1
next prev parent reply other threads:[~2025-04-01 1:00 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-01 0:59 [RFC PATCH 00/31] Simplify OCI configuration menu cel
2025-04-01 0:59 ` [RFC PATCH 01/31] terraform/OCI: Remove terraform_oci_instance_display_name cel
2025-04-01 0:59 ` [RFC PATCH 02/31] terraform/OCI: One default value to rule them cel
2025-04-01 0:59 ` [RFC PATCH 03/31] terraform/OCI: Add an "Identity & Access" submenu cel
2025-04-01 0:59 ` [RFC PATCH 04/31] terraform/OCI: Add a "Resource location" submenu cel
2025-04-01 0:59 ` [RFC PATCH 05/31] terraform/OCI: Add a "Compute" Kconfig submenu cel
2025-04-01 0:59 ` cel [this message]
2025-04-01 0:59 ` [RFC PATCH 07/31] terraform/OCI: Add a "Networking" " cel
2025-04-01 0:59 ` [RFC PATCH 08/31] terraform/OCI: Use "output yaml" for the tenancy OCID cel
2025-04-01 0:59 ` [RFC PATCH 09/31] terraform/OCI: Use "output yaml" for the user OCID cel
2025-04-01 0:59 ` [RFC PATCH 10/31] terraform/OCI: Use "output yaml" for the signing key cel
2025-04-01 0:59 ` [RFC PATCH 11/31] terraform/OCI: Use "output yaml" for the fingerprint cel
2025-04-01 0:59 ` [RFC PATCH 12/31] terraform/OCI: Add a Region selector cel
2025-04-01 0:59 ` [RFC PATCH 13/31] terraform/OCI: Add an availability domain selector cel
2025-04-01 0:59 ` [RFC PATCH 14/31] terraform/OCI: Select your compartment by name instead of by OCID cel
2025-04-01 0:59 ` [RFC PATCH 15/31] terraform/OCI: Use "output yaml" for the instance shape setting cel
2025-04-01 0:59 ` [RFC PATCH 16/31] terraform/OCI: Add a shape selector for Flex shapes cel
2025-04-01 0:59 ` [RFC PATCH 17/31] terraform/OCI: Use "output yaml" for the OCPUs setting cel
2025-04-01 0:59 ` [RFC PATCH 18/31] terraform/OCI: Use "output yaml" for the memory_in_gbs setting cel
2025-04-01 0:59 ` [RFC PATCH 19/31] terraform/OCI: Add a shape family selector cel
2025-04-01 0:59 ` [RFC PATCH 20/31] terraform/OCI: Add a bare metal shape selector cel
2025-04-01 0:59 ` [RFC PATCH 21/31] terraform/OCI: Use "output yaml" for the source image setting cel
2025-04-01 0:59 ` [RFC PATCH 22/31] terraform/OCI: Simplify image selection cel
2025-04-01 0:59 ` [RFC PATCH 23/31] terraform/OCI: Remove TERRAFORM_OCI_VOLUMES_ENABLE_EXTRA cel
2025-04-01 0:59 ` [RFC PATCH 24/31] terraform/OCI: Use "output yaml" for the assign_public_ip" setting cel
2025-04-01 0:59 ` [RFC PATCH 25/31] terraform/OCI: Use "output yaml" for the subnet_ocid setting cel
2025-04-01 0:59 ` [RFC PATCH 26/31] terraform/OCI: Add a default VCN cel
2025-04-01 0:59 ` [RFC PATCH 27/31] terraform/OCI: Add a Kconfig switch to create a VCN on the fly cel
2025-04-01 0:59 ` [RFC PATCH 28/31] terraform/OCI: Run "terraform fmt" on provider.tf cel
2025-04-01 0:59 ` [RFC PATCH 29/31] terraform/OCI: Run "terraform fmt" on main.tf cel
2025-04-01 0:59 ` [RFC PATCH 30/31] terraform/OCI: Nit: alphabetize vars.tf cel
2025-04-01 1:00 ` [RFC PATCH 31/31] terraform/OCI: Update the OCI section of docs/kdevops-terraform.md cel
2025-04-02 19:21 ` [RFC PATCH 00/31] Simplify OCI configuration menu Luis Chamberlain
2025-04-02 19:24 ` Luis Chamberlain
2025-04-02 19:38 ` Chuck Lever
2025-04-02 20:08 ` Luis Chamberlain
2025-04-08 12:42 ` Chandan Babu R
2025-04-08 13:20 ` Chuck Lever
2025-04-09 4:04 ` Chandan Babu R
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250401010000.764234-7-cel@kernel.org \
--to=cel@kernel.org \
--cc=chandanbabu@kernel.org \
--cc=chuck.lever@oracle.com \
--cc=kdevops@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox