Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386812 )
Change subject: contint: migrate castor to a profile
......................................................................
contint: migrate castor to a profile
Change-Id: I99c0d100139ca7767b9fa3fb4d9139d4d72ce238
---
A modules/profile/manifests/ci/castor/server.pp
M modules/role/manifests/ci/castor/server.pp
2 files changed, 38 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/12/386812/1
diff --git a/modules/profile/manifests/ci/castor/server.pp
b/modules/profile/manifests/ci/castor/server.pp
new file mode 100644
index 0000000..903c69a
--- /dev/null
+++ b/modules/profile/manifests/ci/castor/server.pp
@@ -0,0 +1,33 @@
+# == Class role::ci::castor::server
+#
+# rsync server to store cache related material from CI jobs.
+#
+class profile::ci::castor::server {
+
+ class { 'rsync::server':
+ # Disable DNS lookup since wmflabs fails to set some for contintcloud
+ # and that is annoying in logs. That is solely needed for host
+ # allow/deny which we do not use. T136276
+ rsyncd_conf => {
+ 'forward lookup' => 'no',
+ }
+ }
+
+ rsync::server::module { 'caches':
+ path => '/srv/jenkins-workspace/caches',
+ read_only => 'yes',
+ uid => 'jenkins-deploy',
+ gid => 'wikidev',
+ require => [
+ File['/srv/jenkins-workspace/caches'],
+ ],
+ }
+
+ file { '/srv/jenkins-workspace/caches':
+ ensure => directory,
+ owner => 'jenkins-deploy',
+ group => 'wikidev',
+ mode => '0775',
+ require => Mount['/srv'],
+ }
+}
diff --git a/modules/role/manifests/ci/castor/server.pp
b/modules/role/manifests/ci/castor/server.pp
index 8cab106..f55c222 100644
--- a/modules/role/manifests/ci/castor/server.pp
+++ b/modules/role/manifests/ci/castor/server.pp
@@ -6,32 +6,11 @@
class role::ci::castor::server {
requires_realm( 'labs' )
+ system::role { 'role::ci::castor::server':
+ description => 'rsync server to store caches artifacts'
+ }
+
require role::ci::slave::labs::common
+ include profile::ci::castor::server
- class { 'rsync::server':
- # Disable DNS lookup since wmflabs fails to set some for contintcloud
- # and that is annoying in logs. That is solely needed for host
- # allow/deny which we do not use. T136276
- rsyncd_conf => {
- 'forward lookup' => 'no',
- }
- }
-
- file { '/srv/jenkins-workspace/caches':
- ensure => directory,
- owner => 'jenkins-deploy',
- group => 'wikidev',
- mode => '0775',
- require => Mount['/srv'],
- }
-
- rsync::server::module { 'caches':
- path => '/srv/jenkins-workspace/caches',
- read_only => 'yes',
- uid => 'jenkins-deploy',
- gid => 'wikidev',
- require => [
- File['/srv/jenkins-workspace/caches'],
- ],
- }
}
--
To view, visit https://gerrit.wikimedia.org/r/386812
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I99c0d100139ca7767b9fa3fb4d9139d4d72ce238
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
