| commit | a00257b79cd797a40c606a4dadca249688ef4310 | [log] [tgz] |
|---|---|---|
| author | mcp-jenkins <mcp-jenkins@mirantis.com> | Thu Feb 07 12:03:35 2019 +0000 |
| committer | Gerrit Code Review <mail@domain.com> | Thu Feb 07 12:03:35 2019 +0000 |
| tree | fe731344ad7d9dee1b41e54ed231d571972e7e73 | |
| parent | 1b30ba5059c5399a2d5ba6035194e66eb248bec2 [diff] | |
| parent | a23ce00963853e66ec57e377743271229e76f6c6 [diff] |
Merge "Ensure resolv.conf is a straight symlink"
diff --git a/linux/network/resolv.sls b/linux/network/resolv.sls index 965ed2f..bac6ebf 100644 --- a/linux/network/resolv.sls +++ b/linux/network/resolv.sls
@@ -11,6 +11,11 @@ - require: - pkg: resolvconf +ensure_resolvconf_symlink: + cmd.run: + - name: dpkg-reconfigure -fnoninteractive resolvconf + - unless: test -L /etc/resolv.conf + {%- if network.resolv is defined %} /etc/resolvconf/resolv.conf.d/base: file.managed: