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