BBlack has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/392714 )
Change subject: recnds+anycast: a couple more puppetization fixups
......................................................................
recnds+anycast: a couple more puppetization fixups
Change-Id: Ia0c18e96de70ae411aa8ea9c0f0826400278a4ab
---
M hieradata/role/common/dnsrecursor.yaml
M modules/profile/manifests/bird/anycast.pp
2 files changed, 6 insertions(+), 4 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
Ayounsi: Looks good to me, but someone else must approve
diff --git a/hieradata/role/common/dnsrecursor.yaml
b/hieradata/role/common/dnsrecursor.yaml
index 5528d21..e5a6620 100644
--- a/hieradata/role/common/dnsrecursor.yaml
+++ b/hieradata/role/common/dnsrecursor.yaml
@@ -2,6 +2,6 @@
profile::bird::advertise_vips:
rec-dns-anycast-vip:
- address: 10.3.0.1/32
+ address: 10.3.0.1
profile::bird::bind_service: 'pdns-recursor.service'
diff --git a/modules/profile/manifests/bird/anycast.pp
b/modules/profile/manifests/bird/anycast.pp
index cd32a61..d277d64 100644
--- a/modules/profile/manifests/bird/anycast.pp
+++ b/modules/profile/manifests/bird/anycast.pp
@@ -11,22 +11,24 @@
$advertise_vips = hiera('profile::bird::advertise_vips', undef),
){
+ $neighbors_for_ferm = join($neighbors_list, ' ')
+
ferm::service { 'bird-bgp':
proto => 'tcp',
port => '179',
- srange => $neighbors_list,
+ srange => "(${neighbors_for_ferm})",
}
if $bfd {
ferm::service { 'bird-bfd-control':
proto => 'udp',
port => '3784',
- srange => $neighbors_list,
+ srange => "(${neighbors_for_ferm})",
}
ferm::service { 'bird-bfd-echo':
proto => 'udp',
port => '3785',
- srange => $neighbors_list,
+ srange => "(${neighbors_for_ferm})",
}
}
--
To view, visit https://gerrit.wikimedia.org/r/392714
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0c18e96de70ae411aa8ea9c0f0826400278a4ab
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: Ayounsi <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
