Dzahn has submitted this change and it was merged.
Change subject: contint: rename slave-scripts class
......................................................................
contint: rename slave-scripts class
"WARNING: class name containing a dash"
Change-Id: Ib3b7a2545bcceba8042f3a0ec92a9bd8380c0b7e
---
M manifests/role/ci.pp
M manifests/role/parsoid.pp
R modules/contint/manifests/slave_scripts.pp
M modules/toollabs/manifests/composer.pp
4 files changed, 9 insertions(+), 8 deletions(-)
Approvals:
Hashar: Looks good to me, but someone else must approve
coren: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index 7d7bcde..7e6c264 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -46,7 +46,7 @@
}
# As of October 2013, the slave scripts are installed with
- # contint::slave-scripts and land under /srv/jenkins.
+ # contint::slave_scripts and land under /srv/jenkins.
# FIXME: clean up Jenkins jobs to no more refer to the paths below:
file { '/var/lib/jenkins/.git':
ensure => directory,
@@ -389,7 +389,7 @@
}
# Trebuchet replacement on labs
- include contint::slave-scripts
+ include contint::slave_scripts
# Include package unsafe for production
include contint::packages::labs
@@ -428,7 +428,7 @@
description => 'CI *LIGHT* Jenkins slave on labs' }
# Trebuchet replacement on labs
- include contint::slave-scripts
+ include contint::slave_scripts
include role::ci::slave::labs::common
include contint::packages::apt
@@ -495,5 +495,5 @@
# change is made on mediawiki/services/citoid repository
include role::ci::slave::labs::common
# Also need the slave scripts for multi-git.sh
- include contint::slave-scripts
+ include contint::slave_scripts
}
diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp
index 107f4fe..b9dd1eb 100644
--- a/manifests/role/parsoid.pp
+++ b/manifests/role/parsoid.pp
@@ -246,6 +246,7 @@
# change is made on mediawiki/services/parsoid repository
include role::ci::slave::labs::common
# Also need the slave scripts for multi-git.sh
- include contint::slave-scripts
+ include contint::slave_scripts
+
}
diff --git a/modules/contint/manifests/slave-scripts.pp
b/modules/contint/manifests/slave_scripts.pp
similarity index 95%
rename from modules/contint/manifests/slave-scripts.pp
rename to modules/contint/manifests/slave_scripts.pp
index c6412e3..e378034 100644
--- a/modules/contint/manifests/slave-scripts.pp
+++ b/modules/contint/manifests/slave_scripts.pp
@@ -1,7 +1,7 @@
-class contint::slave-scripts {
+class contint::slave_scripts {
if $::realm == 'production' {
- fail('contint::slave-scripts must not be used in production. Slaves
are already Trebuchet deployment targets.')
+ fail('contint::slave_scripts must not be used in production. Slaves
are already Trebuchet deployment targets.')
}
# Hack: faking directories that Trebuchet would normally manage.
diff --git a/modules/toollabs/manifests/composer.pp
b/modules/toollabs/manifests/composer.pp
index 3341806..ac03787 100644
--- a/modules/toollabs/manifests/composer.pp
+++ b/modules/toollabs/manifests/composer.pp
@@ -1,5 +1,5 @@
class toollabs::composer {
- # based on contint::slave-scripts
+ # based on contint::slave_scripts
file { '/srv/composer':
ensure => 'directory',
--
To view, visit https://gerrit.wikimedia.org/r/258057
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3b7a2545bcceba8042f3a0ec92a9bd8380c0b7e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
