Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/393708 )
Change subject: various misc roles: remove ganglia
......................................................................
various misc roles: remove ganglia
Bug: T177225
Change-Id: I875e4dea1a2233049b37d9539a6ffeedce2ed0b0
---
M hieradata/role/common/builder.yaml
M hieradata/role/common/phabricator_server.yaml
M hieradata/role/common/planet_server.yaml
M hieradata/role/common/releases.yaml
M hieradata/role/common/requesttracker_server.yaml
M hieradata/role/common/webperf.yaml
M hieradata/role/common/webserver_misc_apps.yaml
M hieradata/role/common/webserver_misc_static.yaml
8 files changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/08/393708/1
diff --git a/hieradata/role/common/builder.yaml
b/hieradata/role/common/builder.yaml
index 82fc96d..62d6a04 100644
--- a/hieradata/role/common/builder.yaml
+++ b/hieradata/role/common/builder.yaml
@@ -7,5 +7,6 @@
profile::docker::builder::proxy_address: "webproxy.%{::site}.wmnet"
profile::docker::builder::proxy_port: "8080"
monitor_screens: false
+standard::has_ganglia: false
# The default setup has no lvm, so no source
#profile::docker::storage::loopback::dm_source: null
diff --git a/hieradata/role/common/phabricator_server.yaml
b/hieradata/role/common/phabricator_server.yaml
index 8b8d5cc..eadbfa5 100644
--- a/hieradata/role/common/phabricator_server.yaml
+++ b/hieradata/role/common/phabricator_server.yaml
@@ -2,6 +2,7 @@
admin::groups:
- phabricator-admin
- phabricator-roots
+standard::has_ganglia: false
apache::logrotate::period: "daily"
apache::logrotate::rotate: 3
diff --git a/hieradata/role/common/planet_server.yaml
b/hieradata/role/common/planet_server.yaml
index a3b25fa..a5e57bb 100644
--- a/hieradata/role/common/planet_server.yaml
+++ b/hieradata/role/common/planet_server.yaml
@@ -1,3 +1,3 @@
cluster: misc
-
planet_domain_name: 'wikimedia.org'
+standard::has_ganglia: false
diff --git a/hieradata/role/common/releases.yaml
b/hieradata/role/common/releases.yaml
index 92ac574..0b07b0a 100644
--- a/hieradata/role/common/releases.yaml
+++ b/hieradata/role/common/releases.yaml
@@ -1,7 +1,7 @@
admin::groups:
- releasers-mediawiki
- releasers-mobile
-
+standard::has_ganglia: false
profile::releases::mediawiki::sitename: 'releases.wikimedia.org'
profile::releases::mediawiki::sitename_jenkins:
'releases-jenkins.wikimedia.org'
profile::releases::mediawiki::server_admin: 'n...@wikimedia.org'
diff --git a/hieradata/role/common/requesttracker_server.yaml
b/hieradata/role/common/requesttracker_server.yaml
index 7ad0377..8758e27 100644
--- a/hieradata/role/common/requesttracker_server.yaml
+++ b/hieradata/role/common/requesttracker_server.yaml
@@ -1 +1,2 @@
standard::has_default_mail_relay: false
+standard::has_ganglia: false
diff --git a/hieradata/role/common/webperf.yaml
b/hieradata/role/common/webperf.yaml
index c637fcb..8c1c633 100644
--- a/hieradata/role/common/webperf.yaml
+++ b/hieradata/role/common/webperf.yaml
@@ -1,3 +1,4 @@
admin::groups:
- perf-team
- eventlogging-admins
+standard::has_ganglia: false
diff --git a/hieradata/role/common/webserver_misc_apps.yaml
b/hieradata/role/common/webserver_misc_apps.yaml
index 7ad0377..8758e27 100644
--- a/hieradata/role/common/webserver_misc_apps.yaml
+++ b/hieradata/role/common/webserver_misc_apps.yaml
@@ -1 +1,2 @@
standard::has_default_mail_relay: false
+standard::has_ganglia: false
diff --git a/hieradata/role/common/webserver_misc_static.yaml
b/hieradata/role/common/webserver_misc_static.yaml
index ff1f796..1e33d9a4 100644
--- a/hieradata/role/common/webserver_misc_static.yaml
+++ b/hieradata/role/common/webserver_misc_static.yaml
@@ -1,3 +1,4 @@
admin::groups:
- releasers-mediawiki
- releasers-mobile
+standard::has_ganglia: false
--
To view, visit https://gerrit.wikimedia.org/r/393708
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I875e4dea1a2233049b37d9539a6ffeedce2ed0b0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
