From 01637e01e51355796e4ab2e10849be2aaff28d9b Mon Sep 17 00:00:00 2001 From: Jiri Tyr Date: Thu, 27 Nov 2014 15:17:21 +0000 Subject: [PATCH 1/5] Adding headers into templates --- templates/bond_Debian.j2 | 6 ++++++ templates/bond_RedHat.j2 | 5 +++++ templates/bond_slave_Debian.j2 | 6 ++++++ templates/bond_slave_RedHat.j2 | 6 ++++++ templates/bonding.conf.j2 | 6 ++++++ templates/bridge_Debian.j2 | 6 ++++++ templates/bridge_RedHat.j2 | 5 +++++ templates/bridge_port_Debian.j2 | 6 ++++++ templates/bridge_port_RedHat.j2 | 5 +++++ templates/ethernet_Debian.j2 | 6 ++++++ templates/ethernet_RedHat.j2 | 5 +++++ templates/route_Debian.j2 | 6 ++++++ templates/route_RedHat.j2 | 6 ++++++ 13 files changed, 74 insertions(+) diff --git a/templates/bond_Debian.j2 b/templates/bond_Debian.j2 index 9f65d7c..218163a 100644 --- a/templates/bond_Debian.j2 +++ b/templates/bond_Debian.j2 @@ -1,3 +1,9 @@ +# +# This file is managed by Ansible. +# Do not edit this file manually. +# Any changes will be automatically reverted. +# + auto {{ item.device }} {% if item.bootproto == 'static' %} iface {{ item.device }} inet static diff --git a/templates/bond_RedHat.j2 b/templates/bond_RedHat.j2 index 7073c9d..650007d 100644 --- a/templates/bond_RedHat.j2 +++ b/templates/bond_RedHat.j2 @@ -1,3 +1,8 @@ +# +# This file is managed by Ansible. +# Do not edit this file manually. +# Any changes will be automatically reverted. +# {% if item.bootproto == 'static' %} DEVICE={{ item.device }} diff --git a/templates/bond_slave_Debian.j2 b/templates/bond_slave_Debian.j2 index 1cdd47e..daf282c 100644 --- a/templates/bond_slave_Debian.j2 +++ b/templates/bond_slave_Debian.j2 @@ -1,3 +1,9 @@ +# +# This file is managed by Ansible. +# Do not edit this file manually. +# Any changes will be automatically reverted. +# + auto {{ item.1 }} iface {{ item.1 }} inet manual bond-master {{ item.0.device }} diff --git a/templates/bond_slave_RedHat.j2 b/templates/bond_slave_RedHat.j2 index d70e185..70c4500 100644 --- a/templates/bond_slave_RedHat.j2 +++ b/templates/bond_slave_RedHat.j2 @@ -1,3 +1,9 @@ +# +# This file is managed by Ansible. +# Do not edit this file manually. +# Any changes will be automatically reverted. +# + DEVICE={{ item.1 }} BOOTPROTO=none MASTER={{ item.0.device }} diff --git a/templates/bonding.conf.j2 b/templates/bonding.conf.j2 index 475cfe6..5d500bb 100644 --- a/templates/bonding.conf.j2 +++ b/templates/bonding.conf.j2 @@ -1 +1,7 @@ +# +# This file is managed by Ansible. +# Do not edit this file manually. +# Any changes will be automatically reverted. +# + options bonding diff --git a/templates/bridge_Debian.j2 b/templates/bridge_Debian.j2 index 5a74afd..ec8c029 100644 --- a/templates/bridge_Debian.j2 +++ b/templates/bridge_Debian.j2 @@ -1,3 +1,9 @@ +# +# This file is managed by Ansible. +# Do not edit this file manually. +# Any changes will be automatically reverted. +# + auto {{ item.device }} {% if item.bootproto == 'static' %} iface {{ item.device }} inet static diff --git a/templates/bridge_RedHat.j2 b/templates/bridge_RedHat.j2 index 9b69c6b..eb8ad49 100644 --- a/templates/bridge_RedHat.j2 +++ b/templates/bridge_RedHat.j2 @@ -1,3 +1,8 @@ +# +# This file is managed by Ansible. +# Do not edit this file manually. +# Any changes will be automatically reverted. +# {% if item.bootproto == 'static' %} DEVICE={{ item.device }} diff --git a/templates/bridge_port_Debian.j2 b/templates/bridge_port_Debian.j2 index 06b976e..4f2c8fc 100644 --- a/templates/bridge_port_Debian.j2 +++ b/templates/bridge_port_Debian.j2 @@ -1,2 +1,8 @@ +# +# This file is managed by Ansible. +# Do not edit this file manually. +# Any changes will be automatically reverted. +# + auto {{ item.1 }} iface {{ item.1 }} inet manual diff --git a/templates/bridge_port_RedHat.j2 b/templates/bridge_port_RedHat.j2 index 4ab9bdb..c779175 100644 --- a/templates/bridge_port_RedHat.j2 +++ b/templates/bridge_port_RedHat.j2 @@ -1,3 +1,8 @@ +# +# This file is managed by Ansible. +# Do not edit this file manually. +# Any changes will be automatically reverted. +# DEVICE={{ item.1 }} TYPE=Ethernet diff --git a/templates/ethernet_Debian.j2 b/templates/ethernet_Debian.j2 index fba82e1..8db3bdc 100644 --- a/templates/ethernet_Debian.j2 +++ b/templates/ethernet_Debian.j2 @@ -1,3 +1,9 @@ +# +# This file is managed by Ansible. +# Do not edit this file manually. +# Any changes will be automatically reverted. +# + {% if item.bootproto == 'static' %} auto {{ item.device }} iface {{ item.device }} inet static diff --git a/templates/ethernet_RedHat.j2 b/templates/ethernet_RedHat.j2 index b695bff..b845794 100644 --- a/templates/ethernet_RedHat.j2 +++ b/templates/ethernet_RedHat.j2 @@ -1,3 +1,8 @@ +# +# This file is managed by Ansible. +# Do not edit this file manually. +# Any changes will be automatically reverted. +# {% if item.bootproto == 'static' %} DEVICE={{ item.device }} diff --git a/templates/route_Debian.j2 b/templates/route_Debian.j2 index df4e07c..f14626e 100644 --- a/templates/route_Debian.j2 +++ b/templates/route_Debian.j2 @@ -1,3 +1,9 @@ +# +# This file is managed by Ansible. +# Do not edit this file manually. +# Any changes will be automatically reverted. +# + {% for i in item.route %} up route add -net {{ i.network }} netmask {{ i.netmask }} gw {{ i.gateway }} dev {{ item.device }} {% endfor %} diff --git a/templates/route_RedHat.j2 b/templates/route_RedHat.j2 index 231d4b3..43fefe8 100644 --- a/templates/route_RedHat.j2 +++ b/templates/route_RedHat.j2 @@ -1,3 +1,9 @@ +# +# This file is managed by Ansible. +# Do not edit this file manually. +# Any changes will be automatically reverted. +# + {% for i in item.route %} ADDRESS{{ loop.index - 1 }}={{ i.network }} NETMASK{{ loop.index - 1 }}={{ i.netmask }} From 0e9f1fb81e0fc897481190d3b85579a8a41e9407 Mon Sep 17 00:00:00 2001 From: Jiri Tyr Date: Thu, 27 Nov 2014 15:24:50 +0000 Subject: [PATCH 2/5] Fixing missing ONBOOT in non-static config --- templates/ethernet_RedHat.j2 | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/templates/ethernet_RedHat.j2 b/templates/ethernet_RedHat.j2 index b845794..7b32347 100644 --- a/templates/ethernet_RedHat.j2 +++ b/templates/ethernet_RedHat.j2 @@ -4,15 +4,19 @@ # Any changes will be automatically reverted. # -{% if item.bootproto == 'static' %} DEVICE={{ item.device }} +{% if item.onboot is defined %} +ONBOOT={{ item.onboot }} +{% endif %} +{% if item.bootproto == 'dhcp' %} +BOOTPROTO=dhcp +{% endif -%} + +{% if item.bootproto == 'static' %} BOOTPROTO=none {% if item.address is defined %} IPADDR={{ item.address }} {% endif %} -{% if item.onboot is defined %} -ONBOOT={{ item.onboot }} -{% endif %} {% if item.netmask is defined %} NETMASK={{ item.netmask }} {% endif %} @@ -20,8 +24,3 @@ NETMASK={{ item.netmask }} GATEWAY={{ item.gateway }} {% endif %} {% endif %} - -{% if item.bootproto == 'dhcp' %} -DEVICE={{ item.device }} -BOOTPROTO=dhcp -{% endif %} From 36b14ec94bbbe23121f0e8828d28e4505e28878b Mon Sep 17 00:00:00 2001 From: Jiri Tyr Date: Wed, 17 Dec 2014 10:42:11 +0000 Subject: [PATCH 3/5] Adding DNS1 and DNS2 options --- templates/ethernet_RedHat.j2 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/templates/ethernet_RedHat.j2 b/templates/ethernet_RedHat.j2 index 7b32347..43f8469 100644 --- a/templates/ethernet_RedHat.j2 +++ b/templates/ethernet_RedHat.j2 @@ -23,4 +23,10 @@ NETMASK={{ item.netmask }} {% if item.gateway is defined %} GATEWAY={{ item.gateway }} {% endif %} +{% if item.dns1 is defined %} +DNS1={{ item.dns1 }} +{% endif %} +{% if item.dns2 is defined %} +DNS2={{ item.dns2 }} +{% endif %} {% endif %} From 93047be34098180def09ac09a60981f5466ff63f Mon Sep 17 00:00:00 2001 From: Jiri Tyr Date: Wed, 21 Jan 2015 23:57:46 +0000 Subject: [PATCH 4/5] Adding PEERDNS option for RedHat --- templates/bond_RedHat.j2 | 3 +++ templates/bridge_RedHat.j2 | 3 +++ templates/ethernet_RedHat.j2 | 3 +++ 3 files changed, 9 insertions(+) diff --git a/templates/bond_RedHat.j2 b/templates/bond_RedHat.j2 index 650007d..d9d25da 100644 --- a/templates/bond_RedHat.j2 +++ b/templates/bond_RedHat.j2 @@ -29,4 +29,7 @@ BONDING_OPTS="mode={{ item.bond_mode }} miimon={{ item.bond_miimon|default(100) USERCTL=no ONBOOT={{ item.onboot|default("yes") }} BOOTPROTO=dhcp +{% if item.peerdns is defined %} +PEERDNS={{ item.peerdns }} +{% endif %} {% endif %} diff --git a/templates/bridge_RedHat.j2 b/templates/bridge_RedHat.j2 index eb8ad49..0dcea71 100644 --- a/templates/bridge_RedHat.j2 +++ b/templates/bridge_RedHat.j2 @@ -32,4 +32,7 @@ BOOTPROTO=dhcp {% if item.stp is defined %} STP={{ item.stp }} {% endif %} +{% if item.peerdns is defined %} +PEERDNS={{ item.peerdns }} +{% endif %} {% endif %} diff --git a/templates/ethernet_RedHat.j2 b/templates/ethernet_RedHat.j2 index 43f8469..ea7decb 100644 --- a/templates/ethernet_RedHat.j2 +++ b/templates/ethernet_RedHat.j2 @@ -10,6 +10,9 @@ ONBOOT={{ item.onboot }} {% endif %} {% if item.bootproto == 'dhcp' %} BOOTPROTO=dhcp +{% if item.peerdns is defined %} +PEERDNS={{ item.peerdns }} +{% endif %} {% endif -%} {% if item.bootproto == 'static' %} From ca6aefdd5bbc91beaed70682627d9e36fa6a1d75 Mon Sep 17 00:00:00 2001 From: Jiri Tyr Date: Wed, 17 Jun 2015 18:01:34 +0100 Subject: [PATCH 5/5] Reload facts on change --- tasks/main.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tasks/main.yml b/tasks/main.yml index b8b827a..e7c5093 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -104,3 +104,12 @@ - shell: ifdown {{ item.item.device }}; ifup {{ item.item.device }} with_items: bond_result.results when: bond_result is defined and item.changed and ansible_os_family == 'RedHat' + +- name: Reload facts + setup: + when: > + ether_result is defined or + bridge_result is defined or + bridge_port_result is defined or + bond_result is defined or + bond_port_result is defined