From 611e278642341fd2285756044d1d9099febe1b5d Mon Sep 17 00:00:00 2001
From: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk>
Date: Wed, 17 Feb 2021 17:00:16 +0000
Subject: [PATCH] Remove single task from lxc_apparmor file

This can go in the lxc_install_apt tasks file where the previous
lxc_apparmor file was included

Change-Id: I2c23303a355c211c1d9d50238a24ef11c3f38580
---
 tasks/lxc_apparmor.yml    | 29 -----------------------------
 tasks/lxc_install_apt.yml | 15 ++++++++++++++-
 2 files changed, 14 insertions(+), 30 deletions(-)
 delete mode 100644 tasks/lxc_apparmor.yml

diff --git a/tasks/lxc_apparmor.yml b/tasks/lxc_apparmor.yml
deleted file mode 100644
index a12194b8..00000000
--- a/tasks/lxc_apparmor.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-# Copyright 2018, SUSE LINUX GmbH.
-#
-# 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: Drop lxc-openstack apparmor profile
-  template:
-    src: "lxc-openstack.apparmor.j2"
-    dest: "/etc/apparmor.d/lxc/lxc-openstack"
-    owner: "root"
-    group: "root"
-    mode: "0644"
-  notify:
-    - Start apparmor
-    - Reload apparmor
-  tags:
-    - lxc-files
-    - lxc-apparmor
-    - lxc_hosts-config
diff --git a/tasks/lxc_install_apt.yml b/tasks/lxc_install_apt.yml
index f3ecea18..16ce0647 100644
--- a/tasks/lxc_install_apt.yml
+++ b/tasks/lxc_install_apt.yml
@@ -49,7 +49,20 @@
     - lxc-irqbalance
     - lxc_hosts-config
 
-- include_tasks: lxc_apparmor.yml
+- name: Drop lxc-openstack apparmor profile
+  template:
+    src: "lxc-openstack.apparmor.j2"
+    dest: "/etc/apparmor.d/lxc/lxc-openstack"
+    owner: "root"
+    group: "root"
+    mode: "0644"
+  notify:
+    - Start apparmor
+    - Reload apparmor
+  tags:
+    - lxc-files
+    - lxc-apparmor
+    - lxc_hosts-config
 
 - name: Flush handler to reload apparmor profiles
   meta: flush_handlers