From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 4DAE44437A for ; Mon, 28 Jul 2025 00:18:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753661886; cv=none; b=eSwLQa2GeqLxCtJ7iguypRS15PD/7AqIg4xCiEythdQ8lvW3NFyUC5zAFSccLUPJ6Pxs6amXIgvhec996BkiYzQ8+SYdMEGS+dazQYRx1m0vV1LvBXOsHMePQDqSWhZ/5SMAhBTCqb2skg9Hk72O2ARe/FEx+dK20YDdkhg16ps= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753661886; c=relaxed/simple; bh=690XrmPleLS/Oy4c34fdNNWoBhPIwDEgWot0f7J4XyA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=M8vRFosgUv1OYzKh1Bcy0x6v2oaGdpDnNUpTzz2GdXfWL69oYQLnAZd4BP1SIn75gzlZp/lsiUoC2xUefbLt+8leN+Qmp6XHnAfx6CalbonZvfXIxR4fdn7T5c70KUoKhj+7MVBVVNTsTdQLwyhJBI4AlvCSnfI4EvBmoovZ1N8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org; spf=none smtp.mailfrom=infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=FSfMwei5; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="FSfMwei5" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=MOAd84juVGifDR58lLCxfwI6Ci41sh30Z/mUGToOWxg=; b=FSfMwei5gA+EDFbg+UDZwHwSAO 94blyC81WHmEckotee2VWVRIWTMAF3xhYwHPlZzCFbPTjUEVSBRvrOSqkuYHgZIJeOsCHCGX2VwQ2 xQi6McIu9CUV7Odnu0wzNHcNAdEoOeFD+g/9OcvxVoXzgnV9Y7oX3hwvdFNPUL/rnDX2wUUYdGsE2 e7nMlYxFWikg9g2TLGzGt3vO6ll3SWZY9hgdKS3pujmq2jqLMxuv20tm+mREbo+tvlntl1L7ipNrR +015g/ofNb0ynIC/WWZUbS+aHLRsnMZ0VLNJ4ccA3vLf3ZPAWYWFw2z7h0/FEfdK4ycuRyYilQodr 6sjQL4BQ==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.98.2 #2 (Red Hat Linux)) id 1ugBZ4-0000000DNWC-19bF; Mon, 28 Jul 2025 00:18:02 +0000 From: Luis Chamberlain To: Chuck Lever , Daniel Gomez , kdevops@lists.linux.dev Cc: Chuck Lever Subject: [PATCH 11/40] terraform: Clean up the destroy tasks Date: Sun, 27 Jul 2025 17:17:30 -0700 Message-ID: <20250728001800.3188617-12-mcgrof@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250728001800.3188617-1-mcgrof@kernel.org> References: <20250728001800.3188617-1-mcgrof@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Luis Chamberlain From: Chuck Lever Originally these tasks needed to run for each inventory host, but as it turns out, they run once on the controller. Signed-off-by: Chuck Lever --- playbooks/roles/terraform/tasks/main.yml | 4 ---- scripts/terraform.Makefile | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/playbooks/roles/terraform/tasks/main.yml b/playbooks/roles/terraform/tasks/main.yml index 3cf195bd..2e8762ab 100644 --- a/playbooks/roles/terraform/tasks/main.yml +++ b/playbooks/roles/terraform/tasks/main.yml @@ -59,8 +59,6 @@ - ssh - name: Remove the ephemeral ssh config file on the control host - delegate_to: localhost - run_once: true ansible.builtin.file: path: "{{ kdevops_ssh_config }}" state: absent @@ -68,8 +66,6 @@ - destroy - name: Destroy terraform resources - delegate_to: localhost - run_once: true community.general.terraform: project_path: "{{ topdir_path }}/terraform/{{ kdevops_terraform_provider }}" state: absent diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile index 865c84c3..91106b5b 100644 --- a/scripts/terraform.Makefile +++ b/scripts/terraform.Makefile @@ -117,7 +117,7 @@ status_terraform: destroy_terraform: $(Q)ansible-playbook $(ANSIBLE_VERBOSE) \ - --connection=local -i $(KDEVOPS_HOSTFILE) \ + --connection=local --inventory localhost, \ playbooks/terraform.yml --tags destroy \ --extra-vars=@./extra_vars.yaml $(Q)rm -f $(KDEVOPS_PROVISIONED_SSH) $(KDEVOPS_PROVISIONED_DEVCONFIG) -- 2.47.2