Muehlenhoff has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/380500 )
Change subject: Remove some salt references
......................................................................
Remove some salt references
Just a few comments.
Change-Id: I56c92ecb6e4e4c30ee870e4108f45b53a807ace4
---
M manifests/site.pp
M modules/base/manifests/debdeploy.pp
M modules/role/manifests/mariadb.pp
3 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/00/380500/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 1939166..0011ea0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1884,7 +1884,7 @@
include ::standard
}
-# cluster management (salt master, cumin master) + other management tools
+# cluster management (cumin master) + other management tools
node 'neodymium.eqiad.wmnet' {
role(mgmt::drac_ilo, cluster::management)
@@ -2129,7 +2129,7 @@
parsoid::vd_server, parsoid::vd_client, parsoid::diffserver)
}
-# cluster management (salt master, cumin master)
+# cluster management (cumin master)
node 'sarin.codfw.wmnet' {
role(cluster::management)
diff --git a/modules/base/manifests/debdeploy.pp
b/modules/base/manifests/debdeploy.pp
index b6df061..532716a 100644
--- a/modules/base/manifests/debdeploy.pp
+++ b/modules/base/manifests/debdeploy.pp
@@ -1,7 +1,7 @@
# == Class: base::debdeploy
#
# debdeploy, used to rollout software updates. Updates are initiated via
-# the debdeploy tool on the Salt master (configured via role::debdeploymaster)
+# the debdeploy tool on the Cumin master(s)
#
class base::debdeploy
{
diff --git a/modules/role/manifests/mariadb.pp
b/modules/role/manifests/mariadb.pp
index d407549..8e62ac0 100644
--- a/modules/role/manifests/mariadb.pp
+++ b/modules/role/manifests/mariadb.pp
@@ -137,7 +137,7 @@
include mariadb::monitor_process
}
-# mysql groups for monitoring and salt
+# mysql groups for monitoring
# * mysql_group (required): general usage of the server, for example:
# - 'core': production mediawiki servers
# - 'dbstore': servers for backup and analytics
--
To view, visit https://gerrit.wikimedia.org/r/380500
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I56c92ecb6e4e4c30ee870e4108f45b53a807ace4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
