Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/401547 )
Change subject: site.pp: convert dns recursors to single role
......................................................................
site.pp: convert dns recursors to single role
Change-Id: Id448dd97ad201f0a4bf978909c30aa20c80bfd97
---
R hieradata/role/codfw/recursor.yaml
R hieradata/role/common/recursor.yaml
R hieradata/role/eqiad/recursor.yaml
R hieradata/role/esams/recursor.yaml
M manifests/site.pp
A modules/role/manifests/recursor.pp
6 files changed, 14 insertions(+), 6 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/role/codfw/dnsrecursor.yaml
b/hieradata/role/codfw/recursor.yaml
similarity index 100%
rename from hieradata/role/codfw/dnsrecursor.yaml
rename to hieradata/role/codfw/recursor.yaml
diff --git a/hieradata/role/common/dnsrecursor.yaml
b/hieradata/role/common/recursor.yaml
similarity index 100%
rename from hieradata/role/common/dnsrecursor.yaml
rename to hieradata/role/common/recursor.yaml
diff --git a/hieradata/role/eqiad/dnsrecursor.yaml
b/hieradata/role/eqiad/recursor.yaml
similarity index 100%
rename from hieradata/role/eqiad/dnsrecursor.yaml
rename to hieradata/role/eqiad/recursor.yaml
diff --git a/hieradata/role/esams/dnsrecursor.yaml
b/hieradata/role/esams/recursor.yaml
similarity index 100%
rename from hieradata/role/esams/dnsrecursor.yaml
rename to hieradata/role/esams/recursor.yaml
diff --git a/manifests/site.pp b/manifests/site.pp
index ab0787b..8949779 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -10,7 +10,7 @@
# Node definitions (alphabetic order)
node 'acamar.wikimedia.org' {
- role(dnsrecursor, ntp)
+ role(recursor)
# use achernar (directly) + eqiad LVS (avoid self-dep)
$nameservers_override = [ '208.80.153.42', '208.80.154.254' ]
@@ -19,7 +19,7 @@
}
node 'achernar.wikimedia.org' {
- role(dnsrecursor, ntp)
+ role(recursor)
# use acamar (directly) + eqiad LVS (avoid self-dep)
$nameservers_override = [ '208.80.153.12', '208.80.154.254' ]
@@ -149,7 +149,7 @@
# DNS recursor
node 'chromium.wikimedia.org' {
- role(dnsrecursor, ntp)
+ role(recursor)
# use hydrogen (directly) + codfw LVS (avoid self-dep)
$nameservers_override = [ '208.80.154.50', '208.80.153.254' ]
@@ -890,7 +890,7 @@
# DNS recursor
node 'hydrogen.wikimedia.org' {
- role(dnsrecursor, ntp)
+ role(recursor)
# use chromium (directly) + codfw LVS (avoid self-dep)
$nameservers_override = [ '208.80.154.157', '208.80.153.254' ]
@@ -1391,7 +1391,7 @@
}
node 'maerlant.wikimedia.org' {
- role(dnsrecursor, ntp)
+ role(recursor)
interface::add_ip6_mapped { 'main': }
}
@@ -1747,7 +1747,7 @@
}
node 'nescio.wikimedia.org' {
- role(dnsrecursor, ntp)
+ role(recursor)
interface::add_ip6_mapped { 'main': }
}
diff --git a/modules/role/manifests/recursor.pp
b/modules/role/manifests/recursor.pp
new file mode 100644
index 0000000..9062f51
--- /dev/null
+++ b/modules/role/manifests/recursor.pp
@@ -0,0 +1,8 @@
+# == class role::recursor
+#
+# Class for configuring production dns recursors that use
+# both class role::dnsrecursor and role::ntp
+class role::recursor {
+ require role::dnsrecursor
+ require role::ntp
+}
--
To view, visit https://gerrit.wikimedia.org/r/401547
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id448dd97ad201f0a4bf978909c30aa20c80bfd97
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
