Commit ee1ee3a4 authored by Louis-Philippe Véronneau's avatar Louis-Philippe Véronneau

Merge branch 'interfaces-races' into 'master'

Avoid staticips and dhcp-server fighting over /etc/network/interfaces

See merge request !78
parents 55e73b35 29ecc583
Pipeline #34104 passed with stages
in 2 minutes and 41 seconds
......@@ -4,7 +4,7 @@
template:
src: templates/interfaces.j2
dest: /etc/network/interfaces
when: staticips.write_interfaces
when: staticips.write_interfaces and 'dhcp-server' not in role_names
notify:
- kill lingering dhclients
- restart networking
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment