Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/385461 )
Change subject: beta: migrate autoupdater to a profile
......................................................................
beta: migrate autoupdater to a profile
2 resolved violations:
modules/beta/manifests/autoupdater.pp
'beta::autoupdater' includes scap::scripts from another module
modules/role/manifests/beta/deploymentserver.pp
role 'role::beta::deploymentserver' includes beta::autoupdater which is
neither a role nor a profile
Change-Id: Ie798dc5cf8fe872a0b08a92bb9a790d9c0331b45
---
M modules/beta/manifests/autoupdater.pp
A modules/profile/manifests/beta/autoupdater.pp
M modules/role/manifests/beta/deploymentserver.pp
3 files changed, 7 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/beta/manifests/autoupdater.pp
b/modules/beta/manifests/autoupdater.pp
index e39c42b..ad3af6b 100644
--- a/modules/beta/manifests/autoupdater.pp
+++ b/modules/beta/manifests/autoupdater.pp
@@ -4,8 +4,6 @@
# cluster. This is the lame way to automatically pull any code merged in master
# branches.
class beta::autoupdater {
- require ::scap::scripts
-
$stage_dir = '/srv/mediawiki-staging'
# Parsoid JavaScript dependencies are updated on beta via npm
diff --git a/modules/profile/manifests/beta/autoupdater.pp
b/modules/profile/manifests/beta/autoupdater.pp
new file mode 100644
index 0000000..0e337fd
--- /dev/null
+++ b/modules/profile/manifests/beta/autoupdater.pp
@@ -0,0 +1,6 @@
+class profile::beta::autoupdater {
+ class { '::scap::scripts': }
+ class { '::beta::autoupdater':
+ require => Class['::scap::scripts']
+ }
+}
diff --git a/modules/role/manifests/beta/deploymentserver.pp
b/modules/role/manifests/beta/deploymentserver.pp
index 4cfebdd..1f18040 100644
--- a/modules/role/manifests/beta/deploymentserver.pp
+++ b/modules/role/manifests/beta/deploymentserver.pp
@@ -2,6 +2,6 @@
#
# filtertags: labs-project-deployment-prep
class role::beta::deploymentserver {
- include beta::autoupdater
+ include profile::beta::autoupdater
include role::beta::mediawiki
}
--
To view, visit https://gerrit.wikimedia.org/r/385461
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie798dc5cf8fe872a0b08a92bb9a790d9c0331b45
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
