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 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 Content-Transfer-Encoding: 8bit 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. -- 2.48.1