From mboxrd@z Thu Jan 1 00:00:00 1970 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 Content-Transfer-Encoding: 8bit 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: -- 2.48.1