Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/72489
Change subject: beta: do not use git-deploy
......................................................................
beta: do not use git-deploy
misc::deployment::scripts is really meant to install git-deploy when we
want to rely on scap. Bastion already includes
misc::deployment::scap-scripts so we ended up with a conflict:
Duplicate definition: Class[Misc::Deployment::Vars] is already defined;
cannot redefine at /etc/puppet/manifests/misc/deployment.pp:164
Change-Id: If38a730f1aaa8ba66e693ed63a6e69e098ef71ff
---
M manifests/misc/beta.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/89/72489/1
diff --git a/manifests/misc/beta.pp b/manifests/misc/beta.pp
index 1ec830c..d86fff8 100644
--- a/manifests/misc/beta.pp
+++ b/manifests/misc/beta.pp
@@ -1,6 +1,6 @@
class misc::beta::autoupdater {
- require misc::deployment::scripts
+ require misc::deployment::common_scripts
file {
"/usr/local/bin/wmf-beta-autoupdate":
--
To view, visit https://gerrit.wikimedia.org/r/72489
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If38a730f1aaa8ba66e693ed63a6e69e098ef71ff
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
