Add support for changing sysctl.conf path

via kolla_sysctl_conf_path

Change-Id: I09b20fa008a7fecedcb599b4792f24215179b853

ansible/group_vars/all.yml

@@ -516,6 +516,9 @@ openstack_service_rpc_workers: "{{ [ansible_processor_vcpus, 3]|min }}"
 # Optionally allow Kolla to set sysctl values
 set_sysctl: "yes"
 
+# Optionally change the path to sysctl.conf modified by Kolla Ansible plays.
+kolla_sysctl_conf_path: /etc/sysctl.conf
+
 # Endpoint type used to connect with OpenStack services with ansible modules.
 # Valid options are [ public, internal, admin ]
 openstack_interface: "admin"

ansible/roles/elasticsearch/tasks/config-host.yml

@@ -5,6 +5,7 @@
     name: "{{ item.name }}"
     value: "{{ item.value }}"
     sysctl_set: yes
+    sysctl_file: "{{ kolla_sysctl_conf_path }}"
   with_items:
     - { name: "vm.max_map_count", value: 262144}
   when:

ansible/roles/haproxy/tasks/config-host.yml

@@ -4,6 +4,7 @@
     name: "{{ item.name }}"
     value: "{{ item.value }}"
     sysctl_set: yes
+    sysctl_file: "{{ kolla_sysctl_conf_path }}"
   become: true
   with_items:
     - { name: "net.ipv4.ip_nonlocal_bind", value: 1}

ansible/roles/neutron/tasks/config-host.yml

@@ -21,6 +21,7 @@
     name: "{{ item.name }}"
     value: "{{ item.value }}"
     sysctl_set: yes
+    sysctl_file: "{{ kolla_sysctl_conf_path }}"
   with_items:
     - { name: "net.ipv4.ip_forward", value: 1}
     - { name: "net.ipv4.conf.all.rp_filter", value: "{{ neutron_l3_agent_host_rp_filter_mode }}"}

ansible/roles/nova-cell/tasks/config-host.yml

@@ -14,6 +14,7 @@
     name: "{{ item.name }}"
     value: "{{ item.value }}"
     sysctl_set: yes
+    sysctl_file: "{{ kolla_sysctl_conf_path }}"
   with_items:
     - { name: "net.bridge.bridge-nf-call-iptables", value: 1}
     - { name: "net.bridge.bridge-nf-call-ip6tables", value: 1}

etc/kolla/globals.yml

@@ -52,6 +52,9 @@
 # kolla_external_vip_address.
 #kolla_external_fqdn: "{{ kolla_external_vip_address }}"
 
+# Optionally change the path to sysctl.conf modified by Kolla Ansible plays.
+#kolla_sysctl_conf_path: /etc/sysctl.conf
+
 ################
 # Docker options
 ################

releasenotes/notes/custom-sysctl-conf-path-ce58e897fc067410.yaml

@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Adds ``kolla_sysctl_conf_path`` variable that allows to customise the path
+    to ``sysctl.conf`` that will be modified by Kolla Ansible plays.
+    The default is ``/etc/sysctl.conf`` as it was before.