Merge pull request #2 from T-Systems-MMS/add-custom-sysctl-conf-flag

add flag for ignoring errors related to sysctl configuration
T-Systems-MMS · Nov 5, 2021 · d1efad9 · d1efad9
2 parents fa9e4b1 + 672df74
commit d1efad9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -16,6 +16,7 @@ All variables are also listed in default values.
 | cni_plugin_dir | yes | /opt/cni/bin | directory where downloaded file and plugins are stored
 | cni_plugin_release_url | yes | https://github.com/containernetworking/plugins/releases/download | Release url for cni plugins
 | cni_plugin_release_version | yes | v1.0.1 | Version of cni-plugins
+| cni_plugin_sysctl_ignore_unknown_keys | no | false | Whether unknown keys in sysctl.conf are allowed
 
 ## Dependencies
 

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -2,3 +2,4 @@
 cni_plugin_dir: /opt/cni/bin
 cni_plugin_release_version: v1.0.1
 cni_plugin_release_url: https://github.com/containernetworking/plugins/releases/download
+cni_plugin_sysctl_ignore_unknown_keys: false
diff --git a/tasks/linux/main.yml b/tasks/linux/main.yml
@@ -19,6 +19,7 @@
     state: present
     value: 1
     reload: true
+    ignoreerrors: "{{ cni_plugin_sysctl_ignore_unknown_keys | bool }}"
   with_items:
     - net.bridge.bridge-nf-call-iptables
     - net.bridge.bridge-nf-call-arptables