From 4c40bcb9d6f7428e3a5e5f3e12937115401df230 Mon Sep 17 00:00:00 2001
From: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk>
Date: Wed, 3 Jul 2024 08:53:26 +0100
Subject: [PATCH] Remove remove_container_journal common task file

This is only used once so is not necessary to be in common_tasks

Change-Id: I510eb382565a08b72ec3f0145e78365e3597207b
---
 .../common-tasks/remove_container_journal.yml | 23 -------------------
 playbooks/containers-lxc-destroy.yml          | 10 ++++++--
 2 files changed, 8 insertions(+), 25 deletions(-)
 delete mode 100644 playbooks/common-tasks/remove_container_journal.yml

diff --git a/playbooks/common-tasks/remove_container_journal.yml b/playbooks/common-tasks/remove_container_journal.yml
deleted file mode 100644
index 1cb9f5f1e9..0000000000
--- a/playbooks/common-tasks/remove_container_journal.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-# Copyright 2018, Rackspace US, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- name: Destroy container journal directories
-  file:
-    path: "/var/log/journal/{{ container_machine_id }}"
-    state: "absent"
-  delegate_to: "{{ physical_host }}"
-  when:
-    - not _container_machine_id is failed
-    - force_containers_destroy | bool
diff --git a/playbooks/containers-lxc-destroy.yml b/playbooks/containers-lxc-destroy.yml
index b8cd695e89..6e26117612 100644
--- a/playbooks/containers-lxc-destroy.yml
+++ b/playbooks/containers-lxc-destroy.yml
@@ -49,10 +49,16 @@
       when:
         - force_containers_destroy | bool
 
-    - name: Including remove_container_journal tasks
-      include_tasks: "common-tasks/remove_container_journal.yml"
+    - name: Destroy container journal directories
       vars:
         container_machine_id: "{{ ((_container_machine_id.content | default('bm9uZQo=')) | b64decode).strip() }}"
+      file:
+        path: "/var/log/journal/{{ container_machine_id }}"
+        state: "absent"
+      delegate_to: "{{ physical_host }}"
+      when:
+        - not _container_machine_id is failed
+        - force_containers_destroy | bool
 
     - name: Destroy container service directories
       file: