From patchwork Tue Apr 1 00:59:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034274 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 A088A3C3C for ; Tue, 1 Apr 2025 01:00:22 +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=1743469222; cv=none; b=YtmX8mVuM8dJuur1uwEB7mnsisIMteHnR3TtwZBxGvRQ12GAOkMDsN+zZxxa4TXMmfAlk/4hYKk8RbDcRDarpEQYoyURgvcSlga0SW2wKnkXYuEqtLbthpmn6Gdhr83coAcnuJyBK3cBFvopwAxVkzxwOfwyHBcLQEnlxrc0JuQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469222; c=relaxed/simple; bh=dGxk5jZJ2So21meDBr1lqYxtrX3gZOIkGG7/lOfFzQQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lmileIEGex2Hhgfx3ru20ltzJDbOGzQItGzuJaGW3DiJfEcuQq84c+D1vfE0PDYgReqvJxVxkcvVhbQscfTjUlE+/fFjT9vEbPZVSJI4LZ4kA+c2BfCpWdQ1e0XLU8JOgORq8lkkgQ9kP5OzGbzC3Wiwx7SNX63/hh2rKwPAl+U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TI12sLX9; 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="TI12sLX9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 244A7C4CEEB; Tue, 1 Apr 2025 01:00:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469222; bh=dGxk5jZJ2So21meDBr1lqYxtrX3gZOIkGG7/lOfFzQQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TI12sLX9jraWMLhI/sImFumaBtNp53c8sXi0+rJhzGHAd+3IBvWlpM5/oiDUH5/1v NfBMlzWMBZJ1y7HdIYL+leBdDRmuUhlp36H2SOuKJTht70jjoZWwoMbLdd0M7iFt2E ZOEF42jCBsEucZBYkUKqxmO58FeEjZO+B94V5zz5tVH4NTTfcxjRBcMtBqX3DwuZyP a5zdVnF1y3qGzOb6SB/Ffjt8QLFIBKnbkJIdba1sVyOuzFmtwWufx+Oq2EebK0+RS3 WTWcxDD7f3VyyDcj4xP2RcVUtI24aEjQfWRkozsS3m8E0dvICRhcO9zTWcWAf5/hrK bfJSQ719uQIvA== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 25/31] terraform/OCI: Use "output yaml" for the subnet_ocid setting Date: Mon, 31 Mar 2025 20:59:54 -0400 Message-ID: <20250401010000.764234-26-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 Refactor: Remove the line in terraform.Makefile that sets "terraform_oci_subnet_ocid" 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 | 4 ---- terraform/oci/kconfigs/Kconfig.network | 11 ++++++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile index 99aadfc51fff..8b9bf984fc42 100644 --- a/scripts/terraform.Makefile +++ b/scripts/terraform.Makefile @@ -94,10 +94,6 @@ TERRAFORM_EXTRA_VARS += terraform_gce_image_name=$(subst ",,$(CONFIG_TERRAFORM_G TERRAFORM_EXTRA_VARS += terraform_gce_credentials=$(subst ",,$(CONFIG_TERRAFORM_GCE_JSON_CREDENTIALS_PATH)) endif -ifeq (y,$(CONFIG_TERRAFORM_OCI)) -TERRAFORM_EXTRA_VARS += terraform_oci_subnet_ocid=$(subst ",,$(CONFIG_TERRAFORM_OCI_SUBNET_OCID)) -endif - ifeq (y,$(CONFIG_TERRAFORM_OPENSTACK)) TERRAFORM_EXTRA_VARS += terraform_openstack_cloud_name=$(subst ",,$(CONFIG_TERRAFORM_TERRAFORM_OPENSTACK_CLOUD_NAME)) TERRAFORM_EXTRA_VARS += terraform_openstack_instance_prefix=$(subst ",,$(CONFIG_TERRAFORM_TERRAFORM_OPENSTACK_INSTANCE_PREFIX)) diff --git a/terraform/oci/kconfigs/Kconfig.network b/terraform/oci/kconfigs/Kconfig.network index 9dc77a266eb4..22d1e5ad3062 100644 --- a/terraform/oci/kconfigs/Kconfig.network +++ b/terraform/oci/kconfigs/Kconfig.network @@ -9,7 +9,12 @@ config TERRAFORM_OCI_ASSIGN_PUBLIC_IP config TERRAFORM_OCI_SUBNET_OCID string "OCI Subnet OCID" + output yaml help - The OCI ID of the subnet. - Read this: - https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm + If there is a long-lived VNC and subnet already available + to which to attach kdevops compute instances, specify the + OCID of this subnet via this option. + + kdevops does not manage this resource. Before running + "make bringup", the subnet must already exist and your OCI + user must have permission to attach to it.