Alexandros Kosiaris has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/402375 )
Change subject: Rename the servermon::wmf role back to servermon
......................................................................
Rename the servermon::wmf role back to servermon
The migration is long over, let's return to saner naming
Change-Id: I26bdc3f6787ee0d340cc89cd1abc246a12246c31
---
M manifests/site.pp
R modules/role/manifests/servermon.pp
2 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index effdbbf..a9a879f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1749,7 +1749,7 @@
# jessie VM for servermon until it supports stretch (T170653)
node 'netmon1003.wikimedia.org' {
- role(network::monitor, servermon::wmf)
+ role(network::monitor, servermon)
interface::add_ip6_mapped { 'main': }
}
diff --git a/modules/role/manifests/servermon/wmf.pp
b/modules/role/manifests/servermon.pp
similarity index 90%
rename from modules/role/manifests/servermon/wmf.pp
rename to modules/role/manifests/servermon.pp
index f135dee..5eaebd0 100644
--- a/modules/role/manifests/servermon/wmf.pp
+++ b/modules/role/manifests/servermon.pp
@@ -1,4 +1,4 @@
-# Class: role::servermon::wmf
+# Class: role::servermon
#
# This class installs all the servermon related parts as WMF requires it
#
@@ -10,10 +10,10 @@
# Requires:
#
# Sample Usage:
-# include role::servermon::wmf
+# role(servermon)
#
# filtertags: labs-project-servermon
-class role::servermon::wmf {
+class role::servermon {
include ::apache
include ::apache::mod::proxy_http
include ::apache::mod::proxy
@@ -36,7 +36,7 @@
class { '::servermon':
ensure => 'present',
- directory => '/srv/deployment/servermon/servermon',
+ directory => '/srv/deployment/servermon/servermon/servermon',
db_engine => 'mysql',
db_name => 'puppet',
db_user => $db_user,
--
To view, visit https://gerrit.wikimedia.org/r/402375
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I26bdc3f6787ee0d340cc89cd1abc246a12246c31
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
