diff mbox series

[RFC,08/31] terraform/OCI: Use "output yaml" for the tenancy OCID

Message ID 20250401010000.764234-9-cel@kernel.org (mailing list archive)
State New
Headers show
Series Simplify OCI configuration menu | expand

Commit Message

Chuck Lever April 1, 2025, 12:59 a.m. UTC 
From: Chuck Lever <chuck.lever@oracle.com>

Refactor: Remove the line in terraform.Makefile that sets
"terraform_oci_tenancy_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 <chuck.lever@oracle.com>
---
 scripts/terraform.Makefile              |  1 -
 terraform/oci/kconfigs/Kconfig.identity | 10 ++++++----
 2 files changed, 6 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile
index 3235c1af84b9..1589585cd2bd 100644
--- a/scripts/terraform.Makefile
+++ b/scripts/terraform.Makefile
@@ -96,7 +96,6 @@  endif
 
 ifeq (y,$(CONFIG_TERRAFORM_OCI))
 TERRAFORM_EXTRA_VARS += terraform_oci_region=$(subst ",,$(CONFIG_TERRAFORM_OCI_REGION))
-TERRAFORM_EXTRA_VARS += terraform_oci_tenancy_ocid=$(subst ",,$(CONFIG_TERRAFORM_OCI_TENANCY_OCID))
 TERRAFORM_EXTRA_VARS += terraform_oci_user_ocid=$(subst ",,$(CONFIG_TERRAFORM_OCI_USER_OCID))
 TERRAFORM_EXTRA_VARS += terraform_oci_user_private_key_path=$(subst ",,$(CONFIG_TERRAFORM_OCI_USER_PRIVATE_KEY_PATH))
 TERRAFORM_EXTRA_VARS += terraform_oci_user_fingerprint=$(subst ",,$(CONFIG_TERRAFORM_OCI_USER_FINGERPRINT))
diff --git a/terraform/oci/kconfigs/Kconfig.identity b/terraform/oci/kconfigs/Kconfig.identity
index 928c700d9bd4..3061c12f6de0 100644
--- a/terraform/oci/kconfigs/Kconfig.identity
+++ b/terraform/oci/kconfigs/Kconfig.identity
@@ -1,9 +1,11 @@ 
 config TERRAFORM_OCI_TENANCY_OCID
-	string "OCI tenant OCID"
+	string "OCI tenancy OCID"
+	output yaml
 	help
-	  The OCI ID of the tenancy to use.
-	  Read this:
-	  https://docs.oracle.com/en-us/iaas/Content/API/SDKDocs/terraformproviderconfiguration.htm
+	  The OCID of the tenancy in which to create kdevops
+	  resources. See:
+
+	  https://docs.oracle.com/en-us/iaas/Content/API/Concepts/apisigningkey.htm#five
 
 config TERRAFORM_OCI_USER_OCID
 	string "OCI user OCID"