Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/406061 )
Change subject: rename piwik::server to just piwik
......................................................................
rename piwik::server to just piwik
There were historic reasons why it was organized
in foo::bar fashion but there isn't a reason for this anymore.
Just like gerrit_server, phabricator_server etc, drop the
useless "server" part from role and profile class names etc.
Change-Id: I701b7ace781a0fd2ae553faad21c97a12d8c20b1
---
R hieradata/role/common/piwik.yaml
M manifests/site.pp
M modules/profile/templates/cumin/aliases.yaml.erb
R modules/role/manifests/piwik.pp
4 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/61/406061/1
diff --git a/hieradata/role/common/piwik/server.yaml
b/hieradata/role/common/piwik.yaml
similarity index 100%
rename from hieradata/role/common/piwik/server.yaml
rename to hieradata/role/common/piwik.yaml
diff --git a/manifests/site.pp b/manifests/site.pp
index 2ca7f64..aa1bd8a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -107,7 +107,7 @@
}
node 'bohrium.eqiad.wmnet' {
- role(piwik::server)
+ role(piwik)
}
# VM with webserver for misc. static sites
diff --git a/modules/profile/templates/cumin/aliases.yaml.erb
b/modules/profile/templates/cumin/aliases.yaml.erb
index b6a9820..3e9e14a 100644
--- a/modules/profile/templates/cumin/aliases.yaml.erb
+++ b/modules/profile/templates/cumin/aliases.yaml.erb
@@ -192,7 +192,7 @@
yubiauth: P{O:yubiauth_server}
# Miscellaneous groups
-misc-analytics: P{O:statistics::web or O:piwik::server or
O:analytics_cluster::coordinator} or A:eventlogging
+misc-analytics: P{O:statistics::web or O:piwik or
O:analytics_cluster::coordinator} or A:eventlogging
misc-apache: P{O:microsites::peopleweb or C:grafana::production or
O:requesttracker or O:releases or O:otrs} or A:planet
misc-devel: P{O:webperf or O:ve or O:archiva} or A:debugproxy or A:mwlog
misc-nonprod: P{O:spare::system or O:test or O:pybaltest or
O:restbase::test_cluster or O:authdns::testns or O:cache::canary}
diff --git a/modules/role/manifests/piwik/server.pp
b/modules/role/manifests/piwik.pp
similarity index 77%
rename from modules/role/manifests/piwik/server.pp
rename to modules/role/manifests/piwik.pp
index 2c79971..98eca30 100644
--- a/modules/role/manifests/piwik/server.pp
+++ b/modules/role/manifests/piwik.pp
@@ -1,6 +1,6 @@
-# == Class: role::piwik::server
+# == Class: role::piwik
#
-class role::piwik::server {
+class role::piwik {
include ::standard
include ::profile::base::firewall
include ::profile::piwik::webserver
@@ -9,7 +9,7 @@
include ::profile::piwik::backup
include ::profile::piwik::database
- system::role { 'piwik::server':
+ system::role { 'piwik':
description => 'Analytics piwik server',
}
}
--
To view, visit https://gerrit.wikimedia.org/r/406061
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I701b7ace781a0fd2ae553faad21c97a12d8c20b1
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
