Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: role::diamond: move to standard::diamond
......................................................................
role::diamond: move to standard::diamond
This never was a real role, but rather a class applied to all production hosts.
Change-Id: I986a938cdfef3865547fbb1bd280458147078886
---
R modules/standard/manifests/diamond.pp
M modules/standard/manifests/init.pp
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/manifests/role/diamond.pp b/modules/standard/manifests/diamond.pp
similarity index 93%
rename from manifests/role/diamond.pp
rename to modules/standard/manifests/diamond.pp
index ef5954c..aa05afb 100644
--- a/manifests/role/diamond.pp
+++ b/modules/standard/manifests/diamond.pp
@@ -1,5 +1,5 @@
-# role class for diamond
-class role::diamond {
+# standard class for diamond
+class standard::diamond {
case $::realm {
'labs': {
diff --git a/modules/standard/manifests/init.pp
b/modules/standard/manifests/init.pp
index 733a5cd..3f5f233 100644
--- a/modules/standard/manifests/init.pp
+++ b/modules/standard/manifests/init.pp
@@ -12,7 +12,7 @@
unless $::fqdn in $::standard::ntp::wmf_peers[$::site] {
include standard::ntp::client
}
- include role::diamond
+ include standard::diamond
if $has_ganglia {
include ::ganglia
--
To view, visit https://gerrit.wikimedia.org/r/273248
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I986a938cdfef3865547fbb1bd280458147078886
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
