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"