openstack/kolla-ansible
Code Issues Proposed changes

Merge "Support setting rp_filter mode"

Browse Source
This commit is contained in:
Zuul 2018-07-23 05:35:34 +00:00 committed by Gerrit Code Review
commit f7101cd41b
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/neutron/defaults/main.yml
View File

@ -242,6 +242,8 @@ neutron_logging_debug: "{{ openstack_logging_debug }}"
openstack_neutron_auth: "{{ openstack_auth }}" openstack_neutron_auth: "{{ openstack_auth }}"
neutron_l3_agent_host_rp_filter_mode: 0
#################### ####################
# Extension drivers # Extension drivers
#################### ####################

4
ansible/roles/neutron/tasks/config.yml
View File

@ -6,8 +6,8 @@
sysctl: name={{ item.name }} value={{ item.value }} sysctl_set=yes sysctl: name={{ item.name }} value={{ item.value }} sysctl_set=yes
with_items: with_items:
- { name: "net.ipv4.ip_forward", value: 1} - { name: "net.ipv4.ip_forward", value: 1}
- { name: "net.ipv4.conf.all.rp_filter", value: 0} - { name: "net.ipv4.conf.all.rp_filter", value: "{{ neutron_l3_agent_host_rp_filter_mode }}"}
- { name: "net.ipv4.conf.default.rp_filter", value: 0} - { name: "net.ipv4.conf.default.rp_filter", value: "{{ neutron_l3_agent_host_rp_filter_mode }}"}
when: when:
- set_sysctl | bool - set_sysctl | bool
- (neutron_l3_agent.enabled | bool and neutron_l3_agent.host_in_groups | bool) - (neutron_l3_agent.enabled | bool and neutron_l3_agent.host_in_groups | bool)

1
ansible/roles/nova/defaults/main.yml
View File

@ -277,6 +277,7 @@ nova_logging_debug: "{{ openstack_logging_debug }}"
openstack_nova_auth: "{{ openstack_auth }}" openstack_nova_auth: "{{ openstack_auth }}"
openstack_placement_auth: "{{ openstack_auth }}" openstack_placement_auth: "{{ openstack_auth }}"
nova_compute_host_rp_filter_mode: 0
nova_libvirt_port: "16509" nova_libvirt_port: "16509"
nova_ssh_port: "8022" nova_ssh_port: "8022"

4
ansible/roles/nova/tasks/config.yml
View File

@ -5,8 +5,8 @@
with_items: with_items:
- { name: "net.bridge.bridge-nf-call-iptables", value: 1} - { name: "net.bridge.bridge-nf-call-iptables", value: 1}
- { name: "net.bridge.bridge-nf-call-ip6tables", value: 1} - { name: "net.bridge.bridge-nf-call-ip6tables", value: 1}
- { name: "net.ipv4.conf.all.rp_filter", value: 0} - { name: "net.ipv4.conf.all.rp_filter", value: "{{ nova_compute_host_rp_filter_mode }}"}
- { name: "net.ipv4.conf.default.rp_filter", value: 0} - { name: "net.ipv4.conf.default.rp_filter", value: "{{ nova_compute_host_rp_filter mode }}"}
when: when:
- set_sysctl | bool - set_sysctl | bool
- inventory_hostname in groups['compute'] - inventory_hostname in groups['compute']