Yuvipanda has submitted this change and it was merged.
Change subject: contint: Move /srv/localhost/qunit resource out of
qunit_localhost class
......................................................................
contint: Move /srv/localhost/qunit resource out of qunit_localhost class
This way the class can be re-used in roles that set up these
directories with a different owner or group.
Change-Id: I1522b530db5566b690f60453c4f7954f1f730dd4
---
M manifests/role/ci.pp
M modules/contint/manifests/qunit_localhost.pp
2 files changed, 14 insertions(+), 15 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
Dzahn: Looks good to me, but someone else must approve
diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index 0f535db..461504a 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -119,7 +119,6 @@
system::role { 'role::ci::slave': description => 'CI slave runner' }
include contint::packages
- include contint::qunit_localhost
include role::gerrit::production::replicationdest
include role::zuul::install
@@ -184,6 +183,20 @@
mode => '0755',
}
+ file { '/srv/localhost':
+ ensure => directory,
+ mode => '0775',
+ owner => 'jenkins-slave',
+ group => 'jenkins-slave',
+ }
+ file { '/srv/localhost/qunit':
+ ensure => directory,
+ mode => '0775',
+ owner => 'jenkins-slave',
+ group => 'jenkins-slave',
+ }
+ include contint::qunit_localhost
+
# Ganglia diskstat plugin is being evaluated on contint production slaves
# servers merely to evaluate it for the standard role. -- hashar,
23-Oct-2013
ganglia::plugin::python { 'diskstat': }
diff --git a/modules/contint/manifests/qunit_localhost.pp
b/modules/contint/manifests/qunit_localhost.pp
index 70cd256..e565459 100644
--- a/modules/contint/manifests/qunit_localhost.pp
+++ b/modules/contint/manifests/qunit_localhost.pp
@@ -1,18 +1,5 @@
class contint::qunit_localhost {
- file { '/srv/localhost':
- ensure => directory,
- mode => '0775',
- owner => 'jenkins-slave',
- group => 'jenkins-slave',
- }
- file { '/srv/localhost/qunit':
- ensure => directory,
- mode => '0775',
- owner => 'jenkins-slave',
- group => 'jenkins-slave',
- }
-
include ::apache::mod::rewrite
contint::localvhost { 'qunit':
@@ -21,5 +8,4 @@
log_prefix => 'qunit',
require => File['/srv/localhost/qunit'],
}
-
}
--
To view, visit https://gerrit.wikimedia.org/r/168630
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1522b530db5566b690f60453c4f7954f1f730dd4
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Matanya <mata...@foss.co.il>
Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
