Faidon Liambotis has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354038 )
Change subject: lists: fix service/server IPs in Hiera
......................................................................
lists: fix service/server IPs in Hiera
The data for lists in Hiera is inaccurate/weird: role/common/lists.yaml
data is stale and incorrect, and being overriden (or worse, overlayed)
by the host-specific hosts/fermium.yaml. Remove the latter and merge the
contents to the former, making the data accurate again.
Change-Id: Idf9f2516b6c6e98ede9e913d6794070fc6a4ea02
---
M hieradata/hosts/fermium.yaml
M hieradata/role/common/lists.yaml
2 files changed, 4 insertions(+), 10 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/hosts/fermium.yaml b/hieradata/hosts/fermium.yaml
index 032d176..e69de29 100644
--- a/hieradata/hosts/fermium.yaml
+++ b/hieradata/hosts/fermium.yaml
@@ -1,6 +0,0 @@
-mailman::lists_ip:
- - '208.80.154.75'
- - '2620:0:861:3::2'
-mailman::server_ip:
- - '208.80.154.74'
- - '2620:0:861:3:208:80:154:74'
diff --git a/hieradata/role/common/lists.yaml b/hieradata/role/common/lists.yaml
index acf42d9..60df589 100644
--- a/hieradata/role/common/lists.yaml
+++ b/hieradata/role/common/lists.yaml
@@ -1,11 +1,11 @@
standard::has_default_mail_relay: false
mailman::lists_servername: 'lists.wikimedia.org'
mailman::lists_ip:
- - '208.80.154.4'
- - '2620:0:861:1::2'
+ - '208.80.154.75'
+ - '2620:0:861:3::2'
mailman::server_ip:
- - '208.80.154.61'
- - '2620:0:861:1:208:80:154:61'
+ - '208.80.154.74'
+ - '2620:0:861:1:208:80:154:74'
debdeploy::grains:
debdeploy-lists:
value: standard
--
To view, visit https://gerrit.wikimedia.org/r/354038
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idf9f2516b6c6e98ede9e913d6794070fc6a4ea02
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
