Alexandros Kosiaris has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/379195 )
Change subject: Rename role::test::system to role::test
......................................................................
Rename role::test::system to role::test
There is no reason for this role to be 2 level anymore, move back to
1 level. Amend all the inclusions and related configs
Change-Id: If7f9de8ac0a5605030ebc05290b1faf4296fb9a0
---
M manifests/site.pp
M modules/profile/templates/cumin/aliases.yaml.erb
A modules/role/manifests/test.pp
D modules/role/manifests/test/system.pp
4 files changed, 14 insertions(+), 14 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 450c265..7c3ad41 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1121,7 +1121,7 @@
# graphite test machine, currently with SSD caching + spinning disks
node 'graphite1002.eqiad.wmnet' {
- role(test::system)
+ role(test)
}
# graphite additional machine, for additional space
@@ -1532,7 +1532,7 @@
# misc. test server, keep (T156208)
node 'multatuli.wikimedia.org' {
- role(test::system)
+ role(test)
interface::add_ip6_mapped { 'main': }
}
@@ -2109,7 +2109,7 @@
# Right now, both rt-server and rt-clients run on the same node
# But, we are likely going to split them into different boxes soon.
node 'ruthenium.eqiad.wmnet' {
- role(test::system,
+ role(test,
parsoid::testing, parsoid::rt_server, parsoid::rt_client,
parsoid::vd_server, parsoid::vd_client, parsoid::diffserver)
}
@@ -2280,7 +2280,7 @@
# test system for performance team (T117888)
node 'tungsten.eqiad.wmnet' {
- role(test::system, xhgui::app)
+ role(test, xhgui::app)
}
# replaced magnesium (RT) (T119112 T123713)
diff --git a/modules/profile/templates/cumin/aliases.yaml.erb
b/modules/profile/templates/cumin/aliases.yaml.erb
index 5b03a86..3e17297 100644
--- a/modules/profile/templates/cumin/aliases.yaml.erb
+++ b/modules/profile/templates/cumin/aliases.yaml.erb
@@ -182,7 +182,7 @@
misc-analytics: P{R:class = role::statistics::web or R:class =
role::piwik::server} or A:eventlogging
misc-apache: P{R:class = role::microsites::peopleweb or R:class =
grafana::production or R:class = role::requesttracker_server or R:class =
role::releases or R:class = role::otrs or R:class = role::ganglia::web} or
A:planet
misc-devel: P{R:class = role::webperf or R:class = role::ve or R:class =
role::archiva} or A:debugproxy or A:mwlog
-misc-nonprod: P{R:class = role::spare::system or R:class = role::test::system
or R:class = role::security::tools}
+misc-nonprod: P{R:class = role::spare::system or R:class = role::test or
R:class = role::security::tools}
misc-ops: A:installserver or A:cumin or A:url-downloader or A:icinga or
P{R:class = role::logging::kafkatee::webrequest::ops or R:class = role::builder
or R:class = role::syslog::centralserver or R:class = role::pmacct or R:class =
role::backup::offsite or R:class = role::backup} or A:netmon
misc-others: P{R:class = role::mw_rc_irc or R:class = role::etherpad or
R:class = role::tor_relay or R:class = role::lists}
misc-releng: P{R:class = role::labs::openstack::nodepool or R:class =
role::phabricator_server} or A:contint or A:gerrit
diff --git a/modules/role/manifests/test.pp b/modules/role/manifests/test.pp
new file mode 100644
index 0000000..85c9c6c
--- /dev/null
+++ b/modules/role/manifests/test.pp
@@ -0,0 +1,9 @@
+# role to (ironically) apply on unpuppetized systems
+#
+# filtertags: labs-project-puppet
+class role::test {
+ include ::standard
+ include ::base::firewall
+
+ system::role { 'test': description => 'Unpuppetised system for testing' }
+}
diff --git a/modules/role/manifests/test/system.pp
b/modules/role/manifests/test/system.pp
deleted file mode 100644
index a98363a..0000000
--- a/modules/role/manifests/test/system.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# role to (ironically) apply on unpuppetized systems
-#
-# filtertags: labs-project-puppet
-class role::test::system {
- include ::standard
- include ::base::firewall
-
- system::role { 'test::system': description => 'Unpuppetised system for
testing' }
-}
--
To view, visit https://gerrit.wikimedia.org/r/379195
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If7f9de8ac0a5605030ebc05290b1faf4296fb9a0
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[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
