From: nicoo <nicoo@realraum.at>
Date: Tue, 18 Dec 2018 01:29:36 +0000 (+0100)
Subject: ansible/base: Drop network_modules variable
X-Git-Url: https://git.realraum.at/?a=commitdiff_plain;h=f03e9d9f527a8f7ab6378dc55b485cf096fb9ba6;p=noc.git

ansible/base: Drop network_modules variable
---

diff --git a/ansible/roles/base/defaults/main.yml b/ansible/roles/base/defaults/main.yml
index 400e851..ea08535 100644
--- a/ansible/roles/base/defaults/main.yml
+++ b/ansible/roles/base/defaults/main.yml
@@ -1,4 +1 @@
 base_managed_ntpd: yes
-
-network_modules:
-  - tcp_bbr
diff --git a/ansible/roles/base/tasks/06net.yml b/ansible/roles/base/tasks/06net.yml
index 17a5950..04e33cd 100644
--- a/ansible/roles/base/tasks/06net.yml
+++ b/ansible/roles/base/tasks/06net.yml
@@ -1,14 +1,13 @@
 ---
-- name: Configure to load network-related kernel modules
+- name: Load the tcp_bbr kernel module
+  modprobe:
+    name: tcp_bbr
+
+- name: Persist the tcp_bbr module to configuration
   copy:
     dest: /etc/modules-load.d/local-network.conf
-    content: '{{ network_modules | join("\n") }}'
+    content: tcp_bbr
 
-- name: Load network-related kernel modules
-  modprobe:
-    name: "{{ item }}"
-  with_items: "{{ network_modules }}"
-    
 - name: Set network-related sysctl options
   sysctl:
     sysctl_file: /etc/sysctl.d/local-network.conf