Volans has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/350818 )
Change subject: Mediawiki: update role name for maintenance
......................................................................
Mediawiki: update role name for maintenance
Bug: T160178
Change-Id: I188a301ad0f79f34b1d2102cdab6ec1b1e8e6274
---
M switchdc/lib/mediawiki.py
M switchdc/stages/t00_disable_puppet.py
M switchdc/stages/t09_start_maintenance.py
3 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Volans: Looks good to me, approved
diff --git a/switchdc/lib/mediawiki.py b/switchdc/lib/mediawiki.py
index 9981919..d53acae 100644
--- a/switchdc/lib/mediawiki.py
+++ b/switchdc/lib/mediawiki.py
@@ -107,7 +107,7 @@
stop -- whether to stop the cronjobs (True) or left them
untouched (False).
"""
remote = Remote(site=dc)
- remote.select('R:class = role::mediawiki::maintenance')
+ remote.select('R:class = role::mediawiki_maintenance')
if stop:
logger.info('Disabling MediaWiki cronjobs in {dc}'.format(dc=dc))
diff --git a/switchdc/stages/t00_disable_puppet.py
b/switchdc/stages/t00_disable_puppet.py
index 2b936cb..8774be2 100644
--- a/switchdc/stages/t00_disable_puppet.py
+++ b/switchdc/stages/t00_disable_puppet.py
@@ -10,7 +10,7 @@
remote = Remote()
# This selects both clusters of mediawiki jobrunners: jobrunner and
videoscaler
jobrunners = Remote.query('R:class = profile::mediawiki::jobrunner')
- maintenance = Remote.query('R:class = role::mediawiki::maintenance')
+ maintenance = Remote.query('R:class = role::mediawiki_maintenance')
remote.select(jobrunners | maintenance)
logger.info('Disabling puppet on MediaWiki jobrunners, videoscalers and
maintenance hosts')
remote.sync('disable-puppet "{message}"'.format(message=get_reason()))
diff --git a/switchdc/stages/t09_start_maintenance.py
b/switchdc/stages/t09_start_maintenance.py
index 2ecc39a..d788d9b 100644
--- a/switchdc/stages/t09_start_maintenance.py
+++ b/switchdc/stages/t09_start_maintenance.py
@@ -9,7 +9,7 @@
"""Sets mediawiki-maintenance online, starting jobrunners, videoscalers
and cronjobs."""
# Enable and run puppet on the hosts where it was disabled
remote = Remote()
- remote.select('R:class = profile::mediawiki::jobrunner or R:class =
role::mediawiki::maintenance')
+ remote.select('R:class = profile::mediawiki::jobrunner or R:class =
role::mediawiki_maintenance')
command = 'run-puppet-agent --enable
"{message}"'.format(message=get_reason())
remote.async(command, batch_size=30)
--
To view, visit https://gerrit.wikimedia.org/r/350818
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I188a301ad0f79f34b1d2102cdab6ec1b1e8e6274
Gerrit-PatchSet: 1
Gerrit-Project: operations/switchdc
Gerrit-Branch: master
Gerrit-Owner: Volans <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Volans <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
