From 22b605abe401e18dfd7990d6fab10fb7b98ed7fb Mon Sep 17 00:00:00 2001 From: Daniel 'f0o' Preussker Date: Sun, 19 Jan 2025 08:14:06 +0000 Subject: [PATCH] Make sysctl configuration path configurable Defaults to /etc/sysctl.conf to retain current behavior Change-Id: I76cc0d1fe550dbb3b8c790389dd0a84ca3674729 --- defaults/main.yml | 2 ++ tasks/lxc_post_install.yml | 1 + 2 files changed, 3 insertions(+) diff --git a/defaults/main.yml b/defaults/main.yml index 07e4bb2d..91dfcc9a 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -223,3 +223,5 @@ lxc_centos_package_key: "{{ _lxc_centos_package_key }}" lxc_ubuntu_mirror: "{{ (ansible_facts['architecture'] == 'x86_64') | ternary('http://archive.ubuntu.com/ubuntu', 'http://ports.ubuntu.com/ubuntu-ports') }}" lxc_apt_mirror: "{{ (ansible_facts['distribution'] == 'Ubuntu') | ternary(lxc_ubuntu_mirror, 'http://deb.debian.org/debian') }}" + +lxc_sysctl_file: "{{ openstack_sysctl_file | default('/etc/sysctl.conf') }}" diff --git a/tasks/lxc_post_install.yml b/tasks/lxc_post_install.yml index 9bed91f0..4fdf82c5 100644 --- a/tasks/lxc_post_install.yml +++ b/tasks/lxc_post_install.yml @@ -79,6 +79,7 @@ name: "{{ item.key }}" value: "{{ item.value }}" sysctl_set: "{{ item.set | default('yes') }}" + sysctl_file: "{{ lxc_sysctl_file }}" state: "{{ item.state | default('present') }}" reload: "{{ item.reload | default('yes') }}" failed_when: false