Hashar has uploaded a new change for review. ( 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(+), 31 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/13/386813/1 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 63099a7..0000000 --- a/modules/role/manifests/ci/publisher/labs.pp +++ /dev/null @@ -1,31 +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 { - - include role::labs::lvm::srv - include rsync::server - - file { '/srv/doc': - ensure => directory, - owner => 'root', - group => 'root', - mode => '0775', - require => Class['role::labs::lvm::srv'], - } - - rsync::server::module { 'doc': - path => '/srv/doc', - read_only => 'no', - require => [ - File['/srv/doc'], - Class['role::labs::lvm::srv'], - ], - } - -} - -- To view, visit https://gerrit.wikimedia.org/r/386813 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8782fc55b6717f614341cad8e527b478a4fbdded 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