From 2f89f3b0289ff7a78a398a92dc4568d1eb99af8e Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Fri, 21 Mar 2014 11:35:04 -0700 Subject: [PATCH] Disable resolvconf on ubuntu And just use a static resolv.conf file instead. There are too many conditions in which resolvconf might find itself, and this is much simpler anyway. Change-Id: I71b80e533afa93a659c634db5e6b9abf6134ab58 --- modules/unbound/manifests/init.pp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/unbound/manifests/init.pp b/modules/unbound/manifests/init.pp index f8c3125dfa..17d045450e 100644 --- a/modules/unbound/manifests/init.pp +++ b/modules/unbound/manifests/init.pp @@ -40,10 +40,13 @@ class unbound ( require => File['/etc/default/unbound'], } - # Make sure resolvconf is enabled (which is the default). - exec {'enable-resolvconf': - command => '/sbin/resolvconf --enable-updates', - creates => '/var/run/resolvconf/enable-updates', + # Rackspace uses static config files + file { '/etc/resolv.conf': + content => "nameserver 127.0.0.1\n", + owner => 'root', + group => 'root', + mode => '0444', + require => Service['unbound'], } }