Skip to content

Commit ce3d04d

Browse files
committed
add class to replace resolv_conf module
replace saz/resolv_conf with internal nebula::resolv_conf
1 parent f9c9b5b commit ce3d04d

File tree

8 files changed

+30
-10
lines changed

8 files changed

+30
-10
lines changed

.fixtures.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,4 @@ fixtures:
3939
reboot: {"repo": "puppetlabs/reboot", "ref": "5.0.0" }
4040
sshkeys_core: {"repo": "puppetlabs/sshkeys_core", "ref": "2.4.0" }
4141
stdlib: {"repo": "puppetlabs/stdlib", "ref": "9.4.1" }
42-
resolv_conf: {"repo": "saz/resolv_conf", "ref": "5.1.0" }
4342
debconf: {"repo": "stm/debconf", "ref": "6.0.0" }

manifests/profile/dns/smartconnect.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
$nameservers = $other_ns_ips
4545
}
4646

47-
class { 'resolv_conf':
47+
class { 'nebula::resolv_conf':
4848
nameservers => concat(['127.0.0.1'], $nameservers),
4949
searchpath => lookup('nebula::resolv_conf::searchpath'),
5050
require => Service['bind9']

manifests/profile/dns/standard.pp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,5 @@
99
# @example
1010
# include nebula::profile::dns::standard
1111
class nebula::profile::dns::standard {
12-
class { 'resolv_conf':
13-
nameservers => lookup('nebula::resolv_conf::nameservers'),
14-
searchpath => lookup('nebula::resolv_conf::searchpath'),
15-
}
12+
include nebula::resolv_conf
1613
}

manifests/resolv_conf.pp

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
class nebula::resolv_conf (
2+
Array[String] $nameservers,
3+
Array[String] $searchpath = "",
4+
String $mode = '0644',
5+
){
6+
# replicate behavior of saz/resolv_conf for Debian based OS
7+
package { 'resolvconf':
8+
ensure => absent
9+
}
10+
11+
file { '/etc/resolv.conf':
12+
owner => 'root',
13+
group => 'root',
14+
mode => $mode,
15+
content => template("nebula/resolv_conf/resolv.conf.erb"),
16+
}
17+
}

metadata.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
{"name": "puppetlabs/reboot", "version_requirement": ">= 5.0.0 < 6.0.0" },
3131
{"name": "puppetlabs/sshkeys_core", "version_requirement": ">= 2.4.0 < 3.0.0" },
3232
{"name": "puppetlabs/stdlib", "version_requirement": ">= 9.4.1 < 10.0.0"},
33-
{"name": "saz/resolv_conf", "version_requirement": ">= 5.1.0 < 6.0.0" },
3433
{"name": "stm/debconf", "version_requirement": ">= 6.0.0 < 7.0.0" }
3534
],
3635
"operatingsystem_support": [

spec/classes/profile/dns/smartconnect_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
end
2222

2323
it do
24-
is_expected.to contain_class('resolv_conf').with_nameservers(
24+
is_expected.to contain_class('nebula::resolv_conf').with_nameservers(
2525
[
2626
'127.0.0.1', # localhost
2727
'5.5.5.5', # nebula::resolv_conf::nameservers[0]
@@ -79,7 +79,7 @@
7979
let(:params) { { other_ns_ips: ['3.3.3.3', '2.2.2.2', '1.1.1.1'] } }
8080

8181
it do
82-
is_expected.to contain_class('resolv_conf').with_nameservers(
82+
is_expected.to contain_class('nebula::resolv_conf').with_nameservers(
8383
[
8484
'127.0.0.1',
8585
'3.3.3.3',

spec/classes/profile/dns/standard_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
let(:facts) { os_facts }
1212

1313
it do
14-
is_expected.to contain_class('resolv_conf').with_nameservers(
14+
is_expected.to contain_class('nebula::resolv_conf').with_nameservers(
1515
['5.5.5.5', '4.4.4.4'],
1616
).with_searchpath(['searchpath.default.invalid'])
1717
end

templates/resolv_conf/resolv.conf.erb

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Managed by puppet (nebula/resolv_conf/resolv.conf.erb)
2+
3+
4+
search <%= @searchpath.join(" ") %>
5+
<% end -%>
6+
<% @nameservers.each do |ns| -%>
7+
nameserver <%= ns %>
8+
<% end -%>

0 commit comments

Comments
 (0)