Faidon Liambotis has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/350768 )
Change subject: Remove c/p interface argument to add_ip6_mapped
......................................................................
Remove c/p interface argument to add_ip6_mapped
interface::add_ip6_mapped is being used with an argument of interface =>
eth0 all across the tree (and one occurence of "eth2"). This is probably
because it was copy/pasted around, since the interface parameter has
always been optional and defaulting to the first interface found so in
all but the eth2 case, it was redundant.
As of recently it's defaulting to the "interface_primary" fact, which
makes the option entirely redundant. Remove it across the tree.
Bug: T163196
Change-Id: Ie89e84aa820160c91a4363f7bcd278cfc83f181c
---
M manifests/site.pp
M modules/profile/manifests/lists.pp
M modules/profile/manifests/mediawiki/maintenance.pp
M modules/profile/manifests/requesttracker/server.pp
M modules/profile/manifests/tor/relay.pp
M modules/profile/manifests/url_downloader.pp
M modules/role/manifests/ganglia/web.pp
M modules/role/manifests/icinga.pp
M modules/role/manifests/planet_server.pp
9 files changed, 44 insertions(+), 100 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/68/350768/1
diff --git a/manifests/site.pp b/manifests/site.pp
index bf2d5be..459ed8e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -16,9 +16,7 @@
role(dnsrecursor, ntp)
include ::standard
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
+ interface::add_ip6_mapped { 'main': }
}
# url-downloaders
@@ -141,9 +139,7 @@
node 'baham.wikimedia.org' {
role(authdns::server)
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
+ interface::add_ip6_mapped { 'main': }
include ::standard
}
@@ -151,14 +147,14 @@
node 'bast1001.wikimedia.org' {
role(bastionhost::general)
- interface::add_ip6_mapped { 'main': interface => 'eth0', }
+ interface::add_ip6_mapped { 'main': }
}
# Bastion in Texas
node 'bast2001.wikimedia.org' {
role(bastionhost::general)
- interface::add_ip6_mapped { 'main': interface => 'eth0', }
+ interface::add_ip6_mapped { 'main': }
}
# Bastion in the Netherlands (replaced bast3001)
@@ -167,7 +163,7 @@
installserver::tftp,
prometheus::ops)
- interface::add_ip6_mapped { 'main': interface => 'eth0', }
+ interface::add_ip6_mapped { 'main': }
class { '::ganglia::monitor::aggregator': sites => 'esams', }
}
@@ -178,7 +174,7 @@
installserver::tftp,
prometheus::ops)
- interface::add_ip6_mapped { 'main': interface => 'eth0', }
+ interface::add_ip6_mapped { 'main': }
class { '::ganglia::monitor::aggregator':
sites => 'ulsfo',
@@ -215,9 +211,7 @@
role(dnsrecursor, ntp)
include ::standard
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
+ interface::add_ip6_mapped { 'main': }
}
# New https://www.mediawiki.org/wiki/Gerrit (T147597)
@@ -253,7 +247,7 @@
include ::standard
- interface::add_ip6_mapped { 'main': interface => 'eth0', }
+ interface::add_ip6_mapped { 'main': }
include ::contint::firewall
}
@@ -365,9 +359,7 @@
role(dataset::primary, dumps::server)
- interface::add_ip6_mapped { 'eth2':
- interface => 'eth2',
- }
+ interface::add_ip6_mapped { 'main': }
}
# MariaDB 10
@@ -911,9 +903,7 @@
node 'eeden.wikimedia.org' {
role(authdns::server)
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
+ interface::add_ip6_mapped { 'main': }
include ::standard
}
@@ -1072,7 +1062,7 @@
include ::standard
include ::base::firewall
- interface::add_ip6_mapped { 'main': interface => 'eth0', }
+ interface::add_ip6_mapped { 'main': }
}
# EventLogging Analytics does not (yet?) run in codfw.
@@ -1125,9 +1115,7 @@
role(backup)
include ::standard
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
+ interface::add_ip6_mapped { 'main': }
}
# Bacula storage
@@ -1141,9 +1129,7 @@
role(dnsrecursor, ntp)
include ::standard
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
+ interface::add_ip6_mapped { 'main': }
}
# irc.wikimedia.org (replaced argon)
@@ -1262,9 +1248,7 @@
installserver::preseed,
aptrepo::wikimedia)
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
+ interface::add_ip6_mapped { 'main': }
class { '::ganglia::monitor::aggregator':
sites => $::site,
@@ -1273,9 +1257,7 @@
# Phabricator
node /^(iridium\.eqiad|phab1001\.eqiad|phab2001\.codfw)\.wmnet$/ {
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
+ interface::add_ip6_mapped { 'main': }
role(phabricator::main)
include ::standard
include ::ganglia
@@ -1285,9 +1267,7 @@
system::role { 'misc':
description => 'Experimental Yubico two factor authentication bastion',
}
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
+ interface::add_ip6_mapped { 'main': }
role(bastionhost::twofa, access_new_install)
}
@@ -1483,9 +1463,7 @@
role(lvs::balancer)
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
+ interface::add_ip6_mapped { 'main': }
include ::lvs::configuration
$ips = $lvs::configuration::subnet_ips
@@ -1584,9 +1562,7 @@
role(lvs::balancer)
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
+ interface::add_ip6_mapped { 'main': }
include ::lvs::configuration
$ips = $lvs::configuration::subnet_ips
@@ -1684,7 +1660,7 @@
$nameservers_override = [ '208.80.153.12', '208.80.153.42',
'208.80.154.254' ]
role(lvs::balancer)
- interface::add_ip6_mapped { 'main': interface => 'eth0' }
+ interface::add_ip6_mapped { 'main': }
include ::lvs::configuration
$ips = $lvs::configuration::subnet_ips
@@ -1785,9 +1761,7 @@
role(lvs::balancer)
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
+ interface::add_ip6_mapped { 'main': }
include ::lvs::configuration
$ips = $lvs::configuration::subnet_ips
@@ -1820,9 +1794,7 @@
role(lvs::balancer)
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
+ interface::add_ip6_mapped { 'main': }
lvs::interface_tweaks {
'eth0': bnx2x => true, txqlen => 10000, rss_pattern => 'eth0-fp-%d';
@@ -1833,9 +1805,7 @@
role(dnsrecursor, ntp)
include ::standard
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
+ interface::add_ip6_mapped { 'main': }
}
node 'maps-test2001.codfw.wmnet' {
@@ -1895,9 +1865,7 @@
node 'multatuli.wikimedia.org' {
role(test::system, mediawiki::migrate)
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
+ interface::add_ip6_mapped { 'main': }
}
# also see dataset1001
@@ -1905,9 +1873,7 @@
role(dataset::secondary, dumps::server)
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
+ interface::add_ip6_mapped { 'main': }
}
node 'ms1002.eqiad.wmnet' {
@@ -2225,18 +2191,14 @@
role(deployment::salt_masters, debdeploy::master, ipmi::mgmt,
access_new_install, mgmt::drac_ilo, cluster::management)
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
+ interface::add_ip6_mapped { 'main': }
}
node 'nescio.wikimedia.org' {
role(dnsrecursor, ntp)
include ::standard
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
+ interface::add_ip6_mapped { 'main': }
}
# network monitoring tool server
@@ -2374,9 +2336,7 @@
include ::standard
include ::lvs::realserver
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
+ interface::add_ip6_mapped { 'main': }
}
node /^prometheus100[34]\.eqiad\.wmnet$/ {
@@ -2384,9 +2344,7 @@
include ::lvs::realserver
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
+ interface::add_ip6_mapped { 'main': }
}
node /^puppetmaster[12]001\.(codfw|eqiad)\.wmnet$/ {
@@ -2395,17 +2353,13 @@
puppetmaster::frontend,
)
include ::standard
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
+ interface::add_ip6_mapped { 'main': }
}
node /^puppetmaster[12]002\.(codfw|eqiad)\.wmnet$/ {
role(puppetmaster::backend)
include ::standard
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
+ interface::add_ip6_mapped { 'main': }
}
@@ -2423,17 +2377,13 @@
node 'radon.wikimedia.org' {
role(authdns::server)
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
+ interface::add_ip6_mapped { 'main': }
include ::standard
}
# Live Recent Changes WebSocket stream
node 'rcs1001.eqiad.wmnet', 'rcs1002.eqiad.wmnet' {
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
+ interface::add_ip6_mapped { 'main': }
role(rcstream)
include ::base::firewall
}
@@ -2511,9 +2461,7 @@
node 'sarin.codfw.wmnet' {
role(cluster::management)
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
+ interface::add_ip6_mapped { 'main': }
}
# Services 'A'
@@ -2557,9 +2505,7 @@
role(puppetmaster::backend)
include ::standard
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
+ interface::add_ip6_mapped { 'main': }
}
@@ -2693,9 +2639,7 @@
role(deployment::server)
include ::base::firewall
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
+ interface::add_ip6_mapped { 'main': }
}
# test system for performance team (T117888)
@@ -2755,7 +2699,7 @@
node 'zosma.codfw.wmnet' {
role(security::tools)
- interface::add_ip6_mapped { 'main': interface => 'eth0', }
+ interface::add_ip6_mapped { 'main': }
}
node default {
diff --git a/modules/profile/manifests/lists.pp
b/modules/profile/manifests/lists.pp
index a89c616..9666a5c 100644
--- a/modules/profile/manifests/lists.pp
+++ b/modules/profile/manifests/lists.pp
@@ -13,7 +13,7 @@
$lists_ip = hiera('mailman::lists_ip')
- interface::add_ip6_mapped { 'main': interface => 'eth0' }
+ interface::add_ip6_mapped { 'main': }
interface::ip { 'lists.wikimedia.org_v4':
interface => 'eth0',
diff --git a/modules/profile/manifests/mediawiki/maintenance.pp
b/modules/profile/manifests/mediawiki/maintenance.pp
index 7ddb210..916eb06 100644
--- a/modules/profile/manifests/mediawiki/maintenance.pp
+++ b/modules/profile/manifests/mediawiki/maintenance.pp
@@ -6,7 +6,7 @@
# Deployment
include ::scap::scripts
- interface::add_ip6_mapped { 'main': interface => 'eth0', }
+ interface::add_ip6_mapped { 'main': }
file { $::mediawiki::scap::mediawiki_staging_dir:
ensure => link,
diff --git a/modules/profile/manifests/requesttracker/server.pp
b/modules/profile/manifests/requesttracker/server.pp
index 3b47cd3..1680c30 100644
--- a/modules/profile/manifests/requesttracker/server.pp
+++ b/modules/profile/manifests/requesttracker/server.pp
@@ -2,7 +2,7 @@
# https://bestpractical.com/request-tracker
class profile::requesttracker::server {
- interface::add_ip6_mapped { 'main': interface => 'eth0', }
+ interface::add_ip6_mapped { 'main': }
include ::passwords::misc::rt
diff --git a/modules/profile/manifests/tor/relay.pp
b/modules/profile/manifests/tor/relay.pp
index 02aa0f0..80c5a85 100644
--- a/modules/profile/manifests/tor/relay.pp
+++ b/modules/profile/manifests/tor/relay.pp
@@ -1,7 +1,7 @@
# sets up a tor relay
class profile::tor::relay {
- interface::add_ip6_mapped { 'main': interface => 'eth0', }
+ interface::add_ip6_mapped { 'main': }
include passwords::tor
$controlpassword = $passwords::tor::hashed_control_password
diff --git a/modules/profile/manifests/url_downloader.pp
b/modules/profile/manifests/url_downloader.pp
index a553741..7069c30 100644
--- a/modules/profile/manifests/url_downloader.pp
+++ b/modules/profile/manifests/url_downloader.pp
@@ -25,7 +25,7 @@
include network::constants
include ::base::firewall
- interface::add_ip6_mapped { 'main': interface => 'eth0', }
+ interface::add_ip6_mapped { 'main': }
if $::realm == 'production' {
$wikimedia = [
diff --git a/modules/role/manifests/ganglia/web.pp
b/modules/role/manifests/ganglia/web.pp
index 62f83b4..e3e192a 100644
--- a/modules/role/manifests/ganglia/web.pp
+++ b/modules/role/manifests/ganglia/web.pp
@@ -5,7 +5,7 @@
include role::ganglia::config
include role::ganglia::views
- interface::add_ip6_mapped { 'main': interface => 'eth0', }
+ interface::add_ip6_mapped { 'main': }
letsencrypt::cert::integrated { 'ganglia':
subjects => 'ganglia.wikimedia.org',
diff --git a/modules/role/manifests/icinga.pp b/modules/role/manifests/icinga.pp
index b1d0fbe..9313d98 100644
--- a/modules/role/manifests/icinga.pp
+++ b/modules/role/manifests/icinga.pp
@@ -34,7 +34,7 @@
$monitoring_groups = hiera('monitoring::groups')
create_resources(monitoring::group, $monitoring_groups)
- interface::add_ip6_mapped { 'main': interface => 'eth0' }
+ interface::add_ip6_mapped { 'main': }
monitoring::service { 'https':
description => 'HTTPS',
diff --git a/modules/role/manifests/planet_server.pp
b/modules/role/manifests/planet_server.pp
index 961daa6..fe59fd8 100644
--- a/modules/role/manifests/planet_server.pp
+++ b/modules/role/manifests/planet_server.pp
@@ -8,5 +8,5 @@
description => 'Planet (venus) weblog aggregator'
}
- interface::add_ip6_mapped { 'main': interface => 'eth0', }
+ interface::add_ip6_mapped { 'main': }
}
--
To view, visit https://gerrit.wikimedia.org/r/350768
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie89e84aa820160c91a4363f7bcd278cfc83f181c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
