From patchwork Tue Apr 1 00:59:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14034273 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 07A885234 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=gqxDP4k2XrcjgDz/cVbYio1L7a7hxaZ8P2ryg0nWVIdMqmungZEX8iDSEnyTdjbAvViOvlda8nXPCOJSuhMpkR+vPa6TyDSb08G5fHQpP3ks88I4vXxijOCL3e23GkyLQSavVg7x98uUMazXg2+dlXIrjDhOGUZ2kN52e51OfTk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743469222; c=relaxed/simple; bh=qJJcBM7v7HiZnrx25McwiqhavsxuW0QDeb5k04mgLuU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=s134vcYPsFAb8lJGnBIZUftUy3S8JnUfn4KsNWtNR5A7zDpIm51Ea/HWotTSIToSk2UoBNQ+2Wobu1bBblxjBgcPitG751C9muYXrDC/WfC6DGSb2DPceM47wpTKlPXKo+NkSE7R87B72nU9U6ehv16p5c5J4AmouqnCQLZaEoc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=heR9KjHJ; 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="heR9KjHJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 846F8C4CEE3; Tue, 1 Apr 2025 01:00:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743469221; bh=qJJcBM7v7HiZnrx25McwiqhavsxuW0QDeb5k04mgLuU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=heR9KjHJnaNZIy2bxxCB+cqg+xL2RN79rZTMWAT7O9l0oAMPeddLk2OrlJxJqyt7d pWF1aRZ/wyMudb+jShArW0sPMM7BUulR82F5NUe7jGNKWVeOx5RjQmwjUhDRuoE/I/ 2sCDta7dJ6c/YaIwwsKpc7EAcdLnqcHECiszM02IvejuWF5NvbIr4PL87/3b+dOKEZ B5L70E4NkE6RSp9fOCsYE4oUiREbNrvySsEgpkhS31Qg2piX1naPb+BqtsSEJZ2xGe YWJ7LENPQ3+rB3KV+6lraLsd7l8DpFoUzqhPIE/F/L9ZMO02gTGz2C0t1A691ednrU cXxOXcP1XiArg== From: cel@kernel.org To: Cc: Chandan Babu R , Chuck Lever Subject: [RFC PATCH 24/31] terraform/OCI: Use "output yaml" for the assign_public_ip" setting Date: Mon, 31 Mar 2025 20:59:53 -0400 Message-ID: <20250401010000.764234-25-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_assign_public_ip" 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 --- playbooks/roles/gen_tfvars/defaults/main.yml | 2 +- .../roles/gen_tfvars/templates/oci/terraform.tfvars.j2 | 2 +- scripts/terraform.Makefile | 5 ----- terraform/oci/kconfigs/Kconfig.network | 9 +++++---- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/playbooks/roles/gen_tfvars/defaults/main.yml b/playbooks/roles/gen_tfvars/defaults/main.yml index f64102b2fbf5..b6caadcb7e0c 100644 --- a/playbooks/roles/gen_tfvars/defaults/main.yml +++ b/playbooks/roles/gen_tfvars/defaults/main.yml @@ -48,7 +48,7 @@ terraform_gce_scatch_disk_type: "invalid" terraform_gce_image_name: "invalid" terraform_gce_credentials: "invalid" -terraform_oci_assign_public_ip: "false" +terraform_oci_assign_public_ip: false terraform_openstack_cloud_name: "invalid" terraform_openstack_instance_prefix: "invalid" diff --git a/playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2 b/playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2 index fd3d9b853c05..192d72ff32a9 100644 --- a/playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2 +++ b/playbooks/roles/gen_tfvars/templates/oci/terraform.tfvars.j2 @@ -13,7 +13,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 }} diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile index d9e28050a508..99aadfc51fff 100644 --- a/scripts/terraform.Makefile +++ b/scripts/terraform.Makefile @@ -95,11 +95,6 @@ TERRAFORM_EXTRA_VARS += terraform_gce_credentials=$(subst ",,$(CONFIG_TERRAFORM_ endif 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 diff --git a/terraform/oci/kconfigs/Kconfig.network b/terraform/oci/kconfigs/Kconfig.network index ab1914c6f6a6..9dc77a266eb4 100644 --- a/terraform/oci/kconfigs/Kconfig.network +++ b/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"