diff options
| author | Zuul <zuul@review.opendev.org> | 2022-03-09 15:40:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-03-09 15:40:32 +0000 |
| commit | da476a7fea9f4e32e76ba6b1fbb46a3e4b78dcff (patch) | |
| tree | f1d30180292de1236986e797029e5c05aff66019 /ansible | |
| parent | 801c2d8fc2236b514bb333cf022dc5161e8d6311 (diff) | |
| parent | caf33be54b3a4c5f2cdd756e122de6aee891154d (diff) | |
| download | kolla-ansible-da476a7fea9f4e32e76ba6b1fbb46a3e4b78dcff.tar.gz kolla-ansible-da476a7fea9f4e32e76ba6b1fbb46a3e4b78dcff.zip | |
Merge "Explicitly unset net.ipv4.ip_forward sysctl"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/neutron/defaults/main.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/neutron/tasks/config-host.yml | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/ansible/roles/neutron/defaults/main.yml b/ansible/roles/neutron/defaults/main.yml index 87bc023a2..09020522a 100644 --- a/ansible/roles/neutron/defaults/main.yml +++ b/ansible/roles/neutron/defaults/main.yml @@ -564,6 +564,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_ipv4_ip_forward: KOLLA_UNSET 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 diff --git a/ansible/roles/neutron/tasks/config-host.yml b/ansible/roles/neutron/tasks/config-host.yml index 79ed2a448..80dfefca2 100644 --- a/ansible/roles/neutron/tasks/config-host.yml +++ b/ansible/roles/neutron/tasks/config-host.yml @@ -25,6 +25,8 @@ sysctl_set: "{{ should_set }}" sysctl_file: "{{ kolla_sysctl_conf_path }}" with_items: + # TODO(mgoddard): Remove net.ipv4.ip_forward from this list in Zed cycle. + - { name: "net.ipv4.ip_forward", value: "{{ neutron_l3_agent_host_ipv4_ip_forward }}"} - { name: "net.ipv4.conf.all.rp_filter", value: "{{ neutron_l3_agent_host_rp_filter_mode }}"} - { name: "net.ipv4.conf.default.rp_filter", value: "{{ neutron_l3_agent_host_rp_filter_mode }}"} - { name: "net.ipv4.neigh.default.gc_thresh1", value: "{{ neutron_l3_agent_host_ipv4_neigh_gc_thresh1 }}"} |