Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/393712 )
Change subject: rename requesttracker_server to just requesttracker
......................................................................
rename requesttracker_server to just requesttracker
Change-Id: Ic4b24585374bd2a63285a357cd9f44edd7f6e835
---
R hieradata/role/common/requesttracker.yaml
M manifests/site.pp
R modules/profile/manifests/requesttracker.pp
M modules/profile/templates/cumin/aliases.yaml.erb
A modules/role/manifests/requesttracker.pp
D modules/role/manifests/requesttracker_server.pp
6 files changed, 14 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/12/393712/1
diff --git a/hieradata/role/common/requesttracker_server.yaml
b/hieradata/role/common/requesttracker.yaml
similarity index 100%
rename from hieradata/role/common/requesttracker_server.yaml
rename to hieradata/role/common/requesttracker.yaml
diff --git a/manifests/site.pp b/manifests/site.pp
index 2b374d0..44dd690 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2296,7 +2296,7 @@
# replaced magnesium (RT) (T119112 T123713)
node 'ununpentium.wikimedia.org' {
- role(requesttracker_server)
+ role(requesttracker)
interface::add_ip6_mapped { 'main': }
}
diff --git a/modules/profile/manifests/requesttracker/server.pp
b/modules/profile/manifests/requesttracker.pp
similarity index 94%
rename from modules/profile/manifests/requesttracker/server.pp
rename to modules/profile/manifests/requesttracker.pp
index e38fae6..edcc0e2 100644
--- a/modules/profile/manifests/requesttracker/server.pp
+++ b/modules/profile/manifests/requesttracker.pp
@@ -1,6 +1,6 @@
# server running "Request Tracker"
# https://bestpractical.com/request-tracker
-class profile::requesttracker::server {
+class profile::requesttracker {
include ::passwords::misc::rt
diff --git a/modules/profile/templates/cumin/aliases.yaml.erb
b/modules/profile/templates/cumin/aliases.yaml.erb
index edcef5a..f836dc7 100644
--- a/modules/profile/templates/cumin/aliases.yaml.erb
+++ b/modules/profile/templates/cumin/aliases.yaml.erb
@@ -191,7 +191,7 @@
# Miscellaneous groups
misc-analytics: P{O:statistics::web or O:piwik::server or
O:analytics_cluster::coordinator} or A:eventlogging
-misc-apache: P{O:microsites::peopleweb or C:grafana::production or
O:requesttracker_server or O:releases or O:otrs} or A:planet
+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}
misc-ops: A:installserver or A:cumin or A:url-downloader or A:icinga or
P{O:logging::kafkatee::webrequest::ops or O:builder or O:syslog::centralserver
or O:pmacct or O:backup::offsite or O:backup} or A:netmon
diff --git a/modules/role/manifests/requesttracker.pp
b/modules/role/manifests/requesttracker.pp
new file mode 100644
index 0000000..13db0de
--- /dev/null
+++ b/modules/role/manifests/requesttracker.pp
@@ -0,0 +1,11 @@
+# https://wikitech.wikimedia.org/wiki/RT
+class role::requesttracker {
+
+ include ::standard
+ include ::profile::base::firewall
+ include ::profile::requesttracker
+
+ system::role { 'requesttracker':
+ description => 'RT server'
+ }
+}
diff --git a/modules/role/manifests/requesttracker_server.pp
b/modules/role/manifests/requesttracker_server.pp
deleted file mode 100644
index 1fe36bc..0000000
--- a/modules/role/manifests/requesttracker_server.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-# https://wikitech.wikimedia.org/wiki/RT
-class role::requesttracker_server {
-
- include ::standard
- include ::profile::base::firewall
- include ::profile::requesttracker::server
-
- system::role { 'requesttracker::server':
- description => 'RT server'
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/393712
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4b24585374bd2a63285a357cd9f44edd7f6e835
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
