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 23B1A2E3371 for ; Tue, 1 Apr 2025 01:00:20 +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=1743469220; cv=none; b=S0avfzpmANoV02nT/nM4aI+6dK3LfAcbiJDHXsxmHKUoAlJF4+9wwx7lp0U8XB0r8jISkapCMhor3tAnipTy3ajd4C634lmLBvbilO9piHhIY0g5sMnGlB4HvE5D4mVg7NMpMtM3FHeVeWvHwiofLhOgD5v0nIgl/C4HDaAKGcU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469220; c=relaxed/simple; bh=OqQDznmVcCXR3ugoHtIx4oNSO140FkuQGJP9LQ3tCgc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=C/ONsNUThuf4Jv5M9Or1iKF/ihd1vJbqhmwmR4E7jnJIJrXsE7iQ1Z89Dt0ZF9ewxWMsHY0Kudyxn39vdw38tiKaegoScrRLSqFSsDi17J7iYCfoG/rdRRsuRDRVwcWHnWIJsGgfQXA/9/r85ab++twakDWy5eq0SakoDYBJEYg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=sonyizEP; 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="sonyizEP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A5000C4CEEA; Tue, 1 Apr 2025 01:00:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469220; bh=OqQDznmVcCXR3ugoHtIx4oNSO140FkuQGJP9LQ3tCgc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sonyizEPnbOTAu+Inbd98V1qM9cXHR5ptYAPGnI45iGt1Ru/X7vM5D/vyjrtzSaU4 oNFOPR3QGEuKmmDeTT9s7PTXEAvGq4Js2t4osrjAH4Kjl5+TY8uU2L3fl/A82vnJLQ 5PisGUltjhpay9kJxXJvnNvq94A2d8r0Bt+GVPUrAhhB2b84BOonptWTP8q4+aZ/vw PH609dZtVG+ljOyU+D6lB6DO2Yyx/EUkS1sN33G8JlaR39PiIBB6scQH0vlfBEzg9e kjTUltrvST1Hv9zpKfmGMWerx8kbBRcYoZvPzbOsuK741VxzMHY7DWEKTGJ8NNZ+G8 4SXeIdLpdZb7A== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 21/31] terraform/OCI: Use "output yaml" for the source image setting Date: Mon, 31 Mar 2025 20:59:50 -0400 Message-ID: <20250401010000.764234-22-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_os_image_ocid" 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 | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile index 2750b63b01c0..e77f4dd0b474 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_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 else diff --git a/terraform/oci/kconfigs/Kconfig.compute b/terraform/oci/kconfigs/Kconfig.compute index 0e3aac104175..e210e9d44dc0 100644 --- a/terraform/oci/kconfigs/Kconfig.compute +++ b/terraform/oci/kconfigs/Kconfig.compute @@ -33,7 +33,8 @@ source "terraform/oci/kconfigs/shapes/Kconfig.flex" source "terraform/oci/kconfigs/shapes/Kconfig.bm" config TERRAFORM_OCI_OS_IMAGE_OCID - string "OCI OS image OCID" + string "OS image OCID" + output yaml help The OCI ID of the OS image to use. Read this: -- 2.48.1