Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214360
Change subject: Remove IPv6 SLAAC addresses from network.pp etc.
......................................................................
Remove IPv6 SLAAC addresses from network.pp etc.
Those should be gone for good now.
Change-Id: Id957db2dd6babbda0dd4504e8328074aab8b1bcb
---
M manifests/network.pp
M manifests/role/gitblit.pp
M modules/contint/manifests/firewall.pp
3 files changed, 2 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/60/214360/1
diff --git a/manifests/network.pp b/manifests/network.pp
index c8f352b..acdd270 100644
--- a/manifests/network.pp
+++ b/manifests/network.pp
@@ -30,18 +30,13 @@
'198.35.26.5', # bast4001.wikimedia.org
'208.80.154.151', # iron.wikimedia.org
'2620:0:861:2:208:80:154:149', # bast1001.wikimedia.org
- '2620:0:861:2:7a2b:cbff:fe09:11ba', #
bast1001.wikimedia.org SLAAC
'2620:0:862:1:91:198:174:113', # hooft.esams.wikimedia.org
- '2620:0:862:1:a6ba:dbff:fe30:d770', #
hooft.esams.wikimedia.org SLAAC
'2620:0:863:1:198:35:26:5', # bast4001.wikimedia.org
- '2620:0:863:1:92b1:1cff:fe4d:4249', #
bast4001.wikimedia.org SLAAC
'2620:0:861:2:208:80:154:151', # iron.wikimedia.org
- '2620:0:861:2:7a2b:cbff:fe09:d5c', # iron.wikimedia.org
SLAAC
],
'monitoring_hosts' => [
'208.80.154.14', # neon.wikimedia.org
'2620:0:861:1:208:80:154:14', # neon.wikimedia.org
- '2620:0:861:1:7a2b:cbff:fe08:a42f', #
neon.wikimedia.org SLAAC
'208.80.154.53', # uranium.wikimedia.org (ganglia,
gmetad needs it)
'2620:0:861:1:208:80:154:53', # uranium.wikimedia.org
],
diff --git a/manifests/role/gitblit.pp b/manifests/role/gitblit.pp
index d5c2711..beb9110 100644
--- a/manifests/role/gitblit.pp
+++ b/manifests/role/gitblit.pp
@@ -32,6 +32,6 @@
# Add ytterbium to ssh exceptions for git replication
ferm::rule { 'ytterbium_ssh_git':
- rule => 'proto tcp dport ssh { saddr (208.80.154.80 208.80.154.81
2620:0:861:3:92b1:1cff:fe2a:e60 2620:0:861:3:208:80:154:80
2620:0:861:3:208:80:154:81) ACCEPT; }'
+ rule => 'proto tcp dport ssh { saddr (208.80.154.80 208.80.154.81
2620:0:861:3:208:80:154:80 2620:0:861:3:208:80:154:81) ACCEPT; }'
}
}
diff --git a/modules/contint/manifests/firewall.pp
b/modules/contint/manifests/firewall.pp
index baa7b9f..fb33bb8 100644
--- a/modules/contint/manifests/firewall.pp
+++ b/modules/contint/manifests/firewall.pp
@@ -46,7 +46,7 @@
# Need to grant ytterbium ssh access for git
ferm::rule { 'ytterbium_ssh':
- rule => 'proto tcp dport ssh { saddr (208.80.154.80 208.80.154.81
2620:0:861:3:92b1:1cff:fe2a:e60 2620:0:861:3:208:80:154:80
2620:0:861:3:208:80:154:81) ACCEPT; }'
+ rule => 'proto tcp dport ssh { saddr (208.80.154.80 208.80.154.81
2620:0:861:3:208:80:154:80 2620:0:861:3:208:80:154:81) ACCEPT; }'
}
# ALLOWS:
--
To view, visit https://gerrit.wikimedia.org/r/214360
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id957db2dd6babbda0dd4504e8328074aab8b1bcb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
