Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/337023 )
Change subject: Remove zuul-merger from scandium.eqiad.wmnet
......................................................................
Remove zuul-merger from scandium.eqiad.wmnet
We have working zuul-merger process on contint1001 and contint2001,
hence there is no more any need for scandium.eqiad.wmnet.
Remove role::zuul::merger
Will have to stop the daemon on it and refresh Icinga.
Bug: T150936
Change-Id: I2a472ea915f3c67d4a3adc44c3aacd8a47516baf
---
M hieradata/hosts/scandium.yaml
M manifests/site.pp
2 files changed, 1 insertion(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/23/337023/1
diff --git a/hieradata/hosts/scandium.yaml b/hieradata/hosts/scandium.yaml
index 32a03db..36b354f 100644
--- a/hieradata/hosts/scandium.yaml
+++ b/hieradata/hosts/scandium.yaml
@@ -1,12 +1,3 @@
admin::groups:
- contint-users
- contint-admins
-
-# Overrides for git_dir since scandium uses /srv/ssd
-zuul::merger:
- gearman_server: '208.80.154.17' # contint1001.wikimedia.org
- gerrit_ssh_key_file: 'ssh/ci/jenkins-bot_gerrit_id_rsa'
- git_dir: '/srv/ssd/zuul/git'
- git_email: "zuul-merger@%{::hostname}"
- git_name: 'Wikimedia Zuul Merger'
- zuul_url: "git://%{::fqdn}"
diff --git a/manifests/site.pp b/manifests/site.pp
index 24a12ee..f44e3c6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2575,24 +2575,10 @@
}
# T95046 install/deploy scandium as zuul merger (ci) server
+# T150936 Phase out scandium
node 'scandium.eqiad.wmnet' {
- role(zuul::merger)
include ::standard
include ::base::firewall
-
- file { '/srv/ssd':
- ensure => 'directory',
- owner => 'root',
- group => 'root',
- }
- mount { '/srv/ssd':
- ensure => mounted,
- device => '/dev/md2',
- fstype => 'xfs',
- options => 'noatime,nodiratime,nobarrier,logbufs=8',
- require => File['/srv/ssd'],
- }
-
}
# Services 'A'
--
To view, visit https://gerrit.wikimedia.org/r/337023
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a472ea915f3c67d4a3adc44c3aacd8a47516baf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
