Faidon Liambotis has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/350778 )
Change subject: lists: switch to interface::alias
......................................................................
lists: switch to interface::alias
This is not a straight replacement: the new manifests adds the
preferred_lft 0 as an option to the IPv6 address which didn't exist
before (even though it should had!). Easier to cleanup manually as these
are just a couple of hosts that are affected.
This is also not fixing a very silly thing in the existing manifest,
which is made a little more evident: it assumes that in the hiera key
mailman::lists_ip the IPv4 address is at index 0 and the IPv6 address at
index 1. This was two separate hiera keys before commit
14333a539ef18287612ab1cce3035e44350f1f49 but it has regressed since.
Change-Id: Idd83f5d5f89c7834f387dc2b05f270371e74c058
---
M modules/profile/manifests/lists.pp
1 file changed, 5 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/78/350778/1
diff --git a/modules/profile/manifests/lists.pp
b/modules/profile/manifests/lists.pp
index a89c616..b9194f9 100644
--- a/modules/profile/manifests/lists.pp
+++ b/modules/profile/manifests/lists.pp
@@ -11,20 +11,13 @@
mailalias { 'root': recipient => '[email protected]' }
- $lists_ip = hiera('mailman::lists_ip')
-
interface::add_ip6_mapped { 'main': interface => 'eth0' }
- interface::ip { 'lists.wikimedia.org_v4':
- interface => 'eth0',
- address => $lists_ip[0],
- prefixlen => '32',
- }
-
- interface::ip { 'lists.wikimedia.org_v6':
- interface => 'eth0',
- address => $lists_ip[1],
- prefixlen => '128',
+ # XXX: needs to be split to v4/v6 variables, like it was pre-14333a539e
+ $lists_ip = hiera('mailman::lists_ip')
+ interface::alias { 'lists.wikimedia.org':
+ ipv4 => $lists_ip[0],
+ ipv6 => $lists_ip[1],
}
letsencrypt::cert::integrated { 'lists':
--
To view, visit https://gerrit.wikimedia.org/r/350778
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd83f5d5f89c7834f387dc2b05f270371e74c058
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
