Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/398227 )
Change subject: Migrate contint::worker_localhost to a profile
......................................................................
Migrate contint::worker_localhost to a profile
Resolved violation:
modules/contint/manifests/worker_localhost.pp:16
class 'contint::worker_localhost' includes apache::mod::rewrite from
another module
Change-Id: I3ae120b07a173cc35cc46eca64a5bc9a6e993523
---
D modules/contint/manifests/worker_localhost.pp
M modules/profile/manifests/ci/worker_localhost.pp
2 files changed, 29 insertions(+), 34 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/27/398227/1
diff --git a/modules/contint/manifests/worker_localhost.pp
b/modules/contint/manifests/worker_localhost.pp
deleted file mode 100644
index 363c123..0000000
--- a/modules/contint/manifests/worker_localhost.pp
+++ /dev/null
@@ -1,31 +0,0 @@
-# == class contint::worker_localhost
-#
-# Apache vhost for localhost testing (qunit/selenium)
-#
-# === Parameters
-#
-# [*owner*]
-# Unix user that runs the jobs. Should be:
-# - Permanent slaves: jenkins-deploy
-# - Nodepool slaves: jenkins
-#
-class contint::worker_localhost(
- $owner,
-) {
-
- include ::apache::mod::rewrite
-
- file { '/srv/localhost-worker':
- ensure => directory,
- mode => '0775',
- owner => $owner,
- group => 'root',
- }
-
- contint::localvhost { 'worker':
- port => 9412,
- docroot => '/srv/localhost-worker',
- log_prefix => 'worker',
- require => File['/srv/localhost-worker'],
- }
-}
diff --git a/modules/profile/manifests/ci/worker_localhost.pp
b/modules/profile/manifests/ci/worker_localhost.pp
index 9414a5d..59cd3b8 100644
--- a/modules/profile/manifests/ci/worker_localhost.pp
+++ b/modules/profile/manifests/ci/worker_localhost.pp
@@ -1,7 +1,33 @@
# == Class profile::ci::worker_localhost
#
-class profile::ci::worker_localhost() {
- class { '::contint::worker_localhost':
- owner => 'jenkins-deploy',
+# Apache virtual host for localhost testing (qunit/selenium)
+#
+# === Parameters
+#
+# [*owner*]
+# Unix user that runs the Jenkins job.
+#
+class profile::ci::worker_localhost(
+ $owner=hiera('jenkins_agent_username'),
+) {
+ file { '/srv/localhost-worker':
+ ensure => directory,
+ mode => '0775',
+ owner => 'jenkins-deploy',
+ group => 'root',
}
+
+ class { '::apache::mod::rewrite':
+ }
+
+ contint::localvhost { 'worker':
+ port => 9412,
+ docroot => '/srv/localhost-worker',
+ log_prefix => 'worker',
+ require => [
+ File['/srv/localhost-worker'],
+ Class['::apache::mod::rewrite'],
+ ],
+ }
+
}
--
To view, visit https://gerrit.wikimedia.org/r/398227
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ae120b07a173cc35cc46eca64a5bc9a6e993523
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
