Filippo Giunchedi has submitted this change and it was merged. Change subject: Remove beta::config ......................................................................
Remove beta::config Mostly unsused, just one use which is now inline Bug: T86644 Change-Id: I30b185a4c4046521835d91bf08ac9b7bbd0de13f --- M modules/beta/manifests/autoupdater.pp D modules/beta/manifests/config.pp 2 files changed, 1 insertion(+), 20 deletions(-) Approvals: Thcipriani: Looks good to me, but someone else must approve Filippo Giunchedi: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/beta/manifests/autoupdater.pp b/modules/beta/manifests/autoupdater.pp index 6d141ff..585c3d9 100644 --- a/modules/beta/manifests/autoupdater.pp +++ b/modules/beta/manifests/autoupdater.pp @@ -4,10 +4,9 @@ # cluster. This is the lame way to automatically pull any code merged in master # branches. class beta::autoupdater { - include ::beta::config require scap::scripts - $stage_dir = $::beta::config::scap_stage_dir + $stage_dir = '/srv/mediawiki-staging' # Parsoid JavaScript dependencies are updated on beta via npm package { 'npm': diff --git a/modules/beta/manifests/config.pp b/modules/beta/manifests/config.pp deleted file mode 100644 index 1f2466d..0000000 --- a/modules/beta/manifests/config.pp +++ /dev/null @@ -1,18 +0,0 @@ -# == Class: beta::config -# -# Shared configuration for beta classes -# -class beta::config { - $bastion_ip = '10.68.21.205' # IP address of deployment-tin - - # Networks to allow for rsync - $rsync_networks = [ - '10.68.16.0/21', # labs-eqiad - ] - - # Directory where files to be scap'ed are staged - $scap_stage_dir = '/srv/mediawiki-staging' - - # Directory where scap'ed files will be placed - $scap_deploy_dir = '/srv/mediawiki' -} -- To view, visit https://gerrit.wikimedia.org/r/322406 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I30b185a4c4046521835d91bf08ac9b7bbd0de13f Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alex Monk <a...@wikimedia.org> Gerrit-Reviewer: 20after4 <mmod...@wikimedia.org> Gerrit-Reviewer: Alex Monk <a...@wikimedia.org> Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org> Gerrit-Reviewer: Hashar <has...@free.fr> Gerrit-Reviewer: Thcipriani <tcipri...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits