diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-16 00:34:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-16 00:34:43 +0000 |
| commit | ca6959ca37522e28c61189d4dc9c954bf29ed207 (patch) | |
| tree | 7d2a496e102ae2dd3d3b6dddbbcbbcdb29c98126 | |
| parent | 25a33ca0dc54b424142532f82b4d4846db493471 (diff) | |
| parent | 976c9c93c76677f3f891bae524f55345be311861 (diff) | |
| download | kolla-ca6959ca37522e28c61189d4dc9c954bf29ed207.tar.gz kolla-ca6959ca37522e28c61189d4dc9c954bf29ed207.zip | |
Merge "Switch to with items for sysctl"
| -rw-r--r-- | ansible/roles/neutron/tasks/config.yml | 15 | ||||
| -rw-r--r-- | ansible/roles/nova/tasks/config.yml | 19 |
2 files changed, 11 insertions, 23 deletions
diff --git a/ansible/roles/neutron/tasks/config.yml b/ansible/roles/neutron/tasks/config.yml index f7c58baed..8f7d6d5e9 100644 --- a/ansible/roles/neutron/tasks/config.yml +++ b/ansible/roles/neutron/tasks/config.yml @@ -1,15 +1,10 @@ --- -- name: Allowing IP forwarding on network node - sysctl: name="net.ipv4.ip_forward" value=1 sysctl_set=yes - when: - - set_sysctl | bool - - inventory_hostname in groups['neutron-l3-agent'] - -- name: Disabling reverse path filter on network node - sysctl: name="net.ipv4.conf.{{ item }}.rp_filter" value=0 sysctl_set=yes +- name: Setting sysctl values + sysctl: name={{ item.name }} value={{ item.value }} sysctl_set=yes with_items: - - "all" - - "default" + - { name: "net.ipv4.ip_forward", value: 1} + - { name: "net.ipv4.conf.all.rp_filter", value: 0} + - { name: "net.ipv4.conf.default.rp_filter", value: 0} when: - set_sysctl | bool - inventory_hostname in groups['neutron-l3-agent'] diff --git a/ansible/roles/nova/tasks/config.yml b/ansible/roles/nova/tasks/config.yml index 468eb5682..cf701f8e1 100644 --- a/ansible/roles/nova/tasks/config.yml +++ b/ansible/roles/nova/tasks/config.yml @@ -1,18 +1,11 @@ --- -- name: Disabling netfilter for bridges - sysctl: name="net.bridge.bridge-nf-call-{{ item }}" value=1 sysctl_set=yes +- name: Setting sysctl values + sysctl: name={{ item.name }} value={{ item.value }} sysctl_set=yes with_items: - - "iptables" - - "ip6tables" - when: - - set_sysctl | bool - - inventory_hostname in groups['compute'] - -- name: Disabling reverse path filter on compute node - sysctl: name="net.ipv4.conf.{{ item }}.rp_filter" value=0 sysctl_set=yes - with_items: - - "all" - - "default" + - { name: "net.bridge.bridge-nf-call-iptables", value: 1} + - { name: "net.bridge.bridge-nf-call-ip6tables", value: 1} + - { name: "net.ipv4.conf.all.rp_filter", value: 0} + - { name: "net.ipv4.conf.default.rp_filter", value: 0} when: - set_sysctl | bool - inventory_hostname in groups['compute'] |