Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/403439 )
Change subject: base::resolving: remove useless "else" clause
......................................................................
base::resolving: remove useless "else" clause
Change-Id: I3ca4358f02835e89864ab15b550e9346fdc3f0b5
---
M modules/base/manifests/resolving.pp
1 file changed, 34 insertions(+), 35 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
Volans: Looks good to me, but someone else must approve
diff --git a/modules/base/manifests/resolving.pp
b/modules/base/manifests/resolving.pp
index 5501a5b..86fccc3 100644
--- a/modules/base/manifests/resolving.pp
+++ b/modules/base/manifests/resolving.pp
@@ -5,44 +5,43 @@
if ! $::nameservers {
fail('Variable $::nameservers is not defined!')
}
- else {
- if $::realm == 'labs' {
- $labs_tld = hiera('labs_tld')
- # Thanks to dhcp, resolvconf is constantly messing with our
resolv.conf. Disable it.
- file { '/sbin/resolvconf':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/base/resolv/resolvconf.dummy',
- }
- file { '/etc/dhcp/dhclient-enter-hooks.d':
- ensure => 'directory',
- }
+ if $::realm == 'labs' {
+ $labs_tld = hiera('labs_tld')
+ # Thanks to dhcp, resolvconf is constantly messing with our
resolv.conf. Disable it.
+ file { '/sbin/resolvconf':
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => 'puppet:///modules/base/resolv/resolvconf.dummy',
+ }
- # also stop dhclient from updating resolv.conf.
- file { '/etc/dhcp/dhclient-enter-hooks.d/nodnsupdate':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/base/resolv/nodnsupdate',
- require => File['/etc/dhcp/dhclient-enter-hooks.d'],
- }
+ file { '/etc/dhcp/dhclient-enter-hooks.d':
+ ensure => 'directory',
+ }
- # Now, finally, we can just puppetize the damn file
- file { '/etc/resolv.conf':
- owner => 'root',
- group => 'root',
- mode => '0444',
- content => template('base/resolv.conf.labs.erb'),
- }
- } else {
- file { '/etc/resolv.conf':
- owner => 'root',
- group => 'root',
- mode => '0444',
- content => template('base/resolv.conf.erb'),
- }
+ # also stop dhclient from updating resolv.conf.
+ file { '/etc/dhcp/dhclient-enter-hooks.d/nodnsupdate':
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => 'puppet:///modules/base/resolv/nodnsupdate',
+ require => File['/etc/dhcp/dhclient-enter-hooks.d'],
+ }
+
+ # Now, finally, we can just puppetize the damn file
+ file { '/etc/resolv.conf':
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ content => template('base/resolv.conf.labs.erb'),
+ }
+ } else {
+ file { '/etc/resolv.conf':
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ content => template('base/resolv.conf.erb'),
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/403439
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3ca4358f02835e89864ab15b550e9346fdc3f0b5
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Gehel <guillaume.leder...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Volans <rcocci...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
