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

Refactor:  Remove the line in terraform.Makefile that sets
"terraform_oci_assign_public_ip" 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

playbooks/roles/gen_tfvars/defaults/main.yml

@@ -17,6 +17,8 @@ terraform_private_net_enabled: "false"
 terraform_private_net_prefix: ""
 terraform_private_net_mask: 0
 
+terraform_oci_assign_public_ip: false
+
 terraform_openstack_cloud_name: "invalid"
 terraform_openstack_instance_prefix: "invalid"
 terraform_openstack_flavor: "invalid"

playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2

@@ -11,7 +11,7 @@ oci_instance_flex_ocpus = {{ terraform_oci_instance_flex_ocpus }}
 oci_instance_flex_memory_in_gbs = {{ terraform_oci_instance_flex_memory_in_gbs }}
 {% endif %}
 oci_os_image_ocid = "{{ terraform_oci_os_image_ocid }}"
-oci_assign_public_ip = "{{ terraform_oci_assign_public_ip | lower }}"
+oci_assign_public_ip = {{ terraform_oci_assign_public_ip | lower }}
 oci_subnet_ocid = "{{ terraform_oci_subnet_ocid }}"
 oci_volumes_per_instance = {{ terraform_oci_volumes_per_instance }}
 oci_volumes_size = {{ terraform_oci_volumes_size }}

scripts/terraform.Makefile

@@ -48,11 +48,6 @@ KDEVOPS_MRPROPER += $(KDEVOPS_NODES)
 DEFAULT_DEPS_REQS_EXTRA_VARS += $(KDEVOPS_TFVARS)
 
 ifeq (y,$(CONFIG_TERRAFORM_OCI))
-ifeq (y, $(CONFIG_TERRAFORM_OCI_ASSIGN_PUBLIC_IP))
-TERRAFORM_EXTRA_VARS += terraform_oci_assign_public_ip=true
-else
-TERRAFORM_EXTRA_VARS += terraform_oci_assign_public_ip=false
-endif
 TERRAFORM_EXTRA_VARS += terraform_oci_subnet_ocid=$(subst ",,$(CONFIG_TERRAFORM_OCI_SUBNET_OCID))
 endif
 

terraform/oci/kconfigs/Kconfig.network

@@ -1,10 +1,11 @@
 config TERRAFORM_OCI_ASSIGN_PUBLIC_IP
-	bool "Assign public IP address to the cloud instance"
+	bool "Assign public IP address to each instance"
+	output yaml
 	default y
 	help
-	  Select this field if public IP address has to be assigned to
-	  the cloud instance. Otherwise a public IP address is
-	  assigned.
+	  Enable this setting if a public IP address should be
+	  assigned to each instance. Leave it unset to prevent your
+	  instances from being accessible on the public internet.
 
 config TERRAFORM_OCI_SUBNET_OCID
 	string "OCI Subnet OCID"