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: