From 51ba33d7f50a8c8dd0a9417ed7e8c2b3d00f5e55 Mon Sep 17 00:00:00 2001
From: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk>
Date: Wed, 17 Feb 2021 16:46:21 +0000
Subject: [PATCH] Move kernel tuning tasks to lxc_post_install.yml

This was a single task in a task file which can be included with the
rest of the post installation tasks

Change-Id: Ic9e0e4fe28aeb3d22e9b06371ee01f923fcd26d9
---
 tasks/lxc_kernel_tuning.yml | 24 ------------------------
 tasks/lxc_post_install.yml  | 10 ++++++++++
 tasks/main.yml              |  4 ----
 3 files changed, 10 insertions(+), 28 deletions(-)
 delete mode 100644 tasks/lxc_kernel_tuning.yml

diff --git a/tasks/lxc_kernel_tuning.yml b/tasks/lxc_kernel_tuning.yml
deleted file mode 100644
index e731fc6c..00000000
--- a/tasks/lxc_kernel_tuning.yml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-# Copyright 2014, 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: Tuning kernel for lxc
-  sysctl:
-    name: "{{ item.key }}"
-    value: "{{ item.value }}"
-    sysctl_set: "{{ item.set|default('yes') }}"
-    state: "{{ item.state|default('present') }}"
-    reload: "{{ item.reload|default('yes') }}"
-  failed_when: false
-  with_items: "{{ lxc_kernel_options }}"
diff --git a/tasks/lxc_post_install.yml b/tasks/lxc_post_install.yml
index 34479242..2e2f0bee 100644
--- a/tasks/lxc_post_install.yml
+++ b/tasks/lxc_post_install.yml
@@ -129,3 +129,13 @@
 
 # Ensure apparmor reindex runs before other things that may fail
 - meta: flush_handlers
+
+- name: Tuning kernel for lxc
+  sysctl:
+    name: "{{ item.key }}"
+    value: "{{ item.value }}"
+    sysctl_set: "{{ item.set|default('yes') }}"
+    state: "{{ item.state|default('present') }}"
+    reload: "{{ item.reload|default('yes') }}"
+  failed_when: false
+  with_items: "{{ lxc_kernel_options }}"
diff --git a/tasks/main.yml b/tasks/main.yml
index dc4cfc67..cb0cc3e3 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -71,10 +71,6 @@
   tags:
     - lxc_hosts-config
 
-- include_tasks: lxc_kernel_tuning.yml
-  tags:
-    - lxc_hosts-config
-
 - include_tasks: lxc_net.yml
   tags:
     - lxc_hosts-config