diff --git a/ansible/roles/neutron/defaults/main.yml b/ansible/roles/neutron/defaults/main.yml index 09bb89fb81335c0ddc62f92193e879ec0921a933..0649eae2c9e25e7b3016f69220d314fe935d7c94 100644 --- a/ansible/roles/neutron/defaults/main.yml +++ b/ansible/roles/neutron/defaults/main.yml @@ -536,7 +536,7 @@ openstack_neutron_auth: "{{ openstack_auth }}" # Set to KOLLA_SKIP to skip setting these (even if set already - total ignore). # Set to KOLLA_UNSET to make Kolla unset these in the managed sysctl.conf file. -neutron_l3_agent_host_rp_filter_mode: 0 +neutron_l3_agent_host_rp_filter_mode: KOLLA_SKIP neutron_l3_agent_host_ipv4_neigh_gc_thresh1: 128 neutron_l3_agent_host_ipv4_neigh_gc_thresh2: 28672 neutron_l3_agent_host_ipv4_neigh_gc_thresh3: 32768 diff --git a/ansible/roles/nova-cell/defaults/main.yml b/ansible/roles/nova-cell/defaults/main.yml index 6c252ecf351167d49c6ca8f9ca5167b56563aa2b..38f3445eb4c25eea6ce461232eafe98cafdd3976 100644 --- a/ansible/roles/nova-cell/defaults/main.yml +++ b/ansible/roles/nova-cell/defaults/main.yml @@ -421,7 +421,7 @@ openstack_nova_auth: "{{ openstack_auth }}" # Set to KOLLA_SKIP to skip setting these (even if set already - total ignore). # Set to KOLLA_UNSET to make Kolla unset these in the managed sysctl.conf file. -nova_compute_host_rp_filter_mode: 0 +nova_compute_host_rp_filter_mode: KOLLA_SKIP nova_safety_upgrade: "no" diff --git a/releasenotes/notes/bug-1837551-4237e2df8725ffc7.yaml b/releasenotes/notes/bug-1837551-4237e2df8725ffc7.yaml new file mode 100644 index 0000000000000000000000000000000000000000..c50816b9405917a695fa5c4dc8cb67d5d46e42d3 --- /dev/null +++ b/releasenotes/notes/bug-1837551-4237e2df8725ffc7.yaml @@ -0,0 +1,13 @@ +--- +upgrade: + - | + ``rp_filter`` is no longer set by Kolla Ansible by default. + Users may wish to remove the related setting from + ``kolla_sysctl_conf_path`` (``/etc/sysctl.conf`` by default). +deprecations: + - | + Setting ``rp_filter`` via Kolla Ansible is deprecated. +fixes: + - | + Workarounds ``rp_filter`` setting issues by defaulting to skipping it. + `LP#1837551 <https://launchpad.net/bugs/1837551>`__