terraform/OCI: Use "output yaml" for the source image setting

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.

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

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

terraform/oci/kconfigs/Kconfig.compute

@@ -40,7 +40,8 @@ source "terraform/oci/kconfigs/shapes/Kconfig.generic"
 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: