| commit | 585d38bf15dd1b34bb88fdf0a5b09735bdba2fdd | [log] [tgz] |
|---|---|---|
| author | mcp-jenkins <mcp-jenkins@mirantis.com> | Wed Mar 13 12:57:15 2019 +0000 |
| committer | Gerrit Code Review <mail@domain.com> | Wed Mar 13 12:57:15 2019 +0000 |
| tree | 379bfc93f308fd42eba46177a295490f86c125ce | |
| parent | dbaecb2215f301d5a6e358519b6b86030276cf33 [diff] | |
| parent | 295ee1bdac196af08159e7be4c0df5023bc538b3 [diff] |
Merge "Ensure resolv.conf is a straight symlink" into release/2019.2.0
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: