terraform/OCI: Use "output yaml" for the subnet_ocid setting

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.

Reviewed-by: Luis Chamberlain <[email protected]>
Reviewed-by: Chandan Babu R <[email protected]>
Signed-off-by: Chuck Lever <[email protected]>

Author: chucklever

scripts/terraform.Makefile

@@ -47,10 +47,6 @@ KDEVOPS_MRPROPER += $(KDEVOPS_NODES)
 
 DEFAULT_DEPS_REQS_EXTRA_VARS += $(KDEVOPS_TFVARS)
 
-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))

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.