Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/386813 )
Change subject: contint: migrate publisher to a profile
......................................................................
contint: migrate publisher to a profile
Drop the ::labs suffix while at it.
For /srv, switch to requiring profile::labs::lvm::srv
Change-Id: I8782fc55b6717f614341cad8e527b478a4fbdded
---
A modules/profile/manifests/ci/publisher.pp
A modules/role/manifests/ci/publisher.pp
D modules/role/manifests/ci/publisher/labs.pp
3 files changed, 37 insertions(+), 29 deletions(-)
Approvals:
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/profile/manifests/ci/publisher.pp
b/modules/profile/manifests/ci/publisher.pp
new file mode 100644
index 0000000..ac56aa9
--- /dev/null
+++ b/modules/profile/manifests/ci/publisher.pp
@@ -0,0 +1,22 @@
+class profile::ci::publisher {
+
+ require profile::labs::lvm::srv
+
+ class { 'rsync::server': }
+
+ file { '/srv/doc':
+ ensure => directory,
+ owner => 'root',
+ group => 'root',
+ mode => '0775',
+ }
+
+ rsync::server::module { 'doc':
+ path => '/srv/doc',
+ read_only => 'no',
+ require => [
+ File['/srv/doc'],
+ ],
+ }
+
+}
diff --git a/modules/role/manifests/ci/publisher.pp
b/modules/role/manifests/ci/publisher.pp
new file mode 100644
index 0000000..feb2c52
--- /dev/null
+++ b/modules/role/manifests/ci/publisher.pp
@@ -0,0 +1,15 @@
+# == Class role::ci::publisher
+#
+# Intermediary rsync host in labs to let Jenkins slave publish their results
+# safely. The production machine hosting doc.wikimedia.org can then fetch the
+# doc from there.
+#
+# filtertags: labs-project-integration
+class role::ci::publisher {
+ system::role { 'role::ci::publisher':
+ description => 'rsync host to publish Jenkins artifacts',
+ }
+
+ include profile::ci::publisher
+}
+
diff --git a/modules/role/manifests/ci/publisher/labs.pp
b/modules/role/manifests/ci/publisher/labs.pp
deleted file mode 100644
index 3997f5b..0000000
--- a/modules/role/manifests/ci/publisher/labs.pp
+++ /dev/null
@@ -1,29 +0,0 @@
-# == Class role::ci::publisher::labs
-#
-# Intermediary rsync hosts in labs to let Jenkins slave publish their results
-# safely. The production machine hosting doc.wikimedia.org can then fetch the
-# doc from there.
-#
-# filtertags: labs-project-integration
-class role::ci::publisher::labs {
-
- require ::profile::labs::lvm::srv
- include rsync::server
-
- file { '/srv/doc':
- ensure => directory,
- owner => 'root',
- group => 'root',
- mode => '0775',
- }
-
- rsync::server::module { 'doc':
- path => '/srv/doc',
- read_only => 'no',
- require => [
- File['/srv/doc'],
- ],
- }
-
-}
-
--
To view, visit https://gerrit.wikimedia.org/r/386813
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8782fc55b6717f614341cad8e527b478a4fbdded
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
