Alexandros Kosiaris has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/353125 )
Change subject: ganeti: move 'include standard' to role
......................................................................
ganeti: move 'include standard' to role
Change-Id: I504d1c74c7b7fb6a46d52976abd24ae9841f0732
---
M manifests/site.pp
M modules/role/manifests/ganeti.pp
2 files changed, 1 insertion(+), 1 deletion(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index de9a00e..fb162af 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1094,7 +1094,6 @@
# Virtualization hosts
node /^ganeti[12]00[0-9]\.(codfw|eqiad)\.wmnet$/ {
role(ganeti)
- include ::standard
}
# Hosts visualization / monitoring of EventLogging event streams
diff --git a/modules/role/manifests/ganeti.pp b/modules/role/manifests/ganeti.pp
index bc1649b..5d956e1 100644
--- a/modules/role/manifests/ganeti.pp
+++ b/modules/role/manifests/ganeti.pp
@@ -1,5 +1,6 @@
# Role classes for ganeti
class role::ganeti {
+ include ::standard
include ::ganeti
# Ganeti hosts have KSM enabled. So get stats about it
diamond::collector { 'KSM': }
--
To view, visit https://gerrit.wikimedia.org/r/353125
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I504d1c74c7b7fb6a46d52976abd24ae9841f0732
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
