Thcipriani has uploaded a new change for review. https://gerrit.wikimedia.org/r/289333
Change subject: Remove scap::clean now that scap is clean ...................................................................... Remove scap::clean now that scap is clean Now that scap::clean has removed old scap code, scap::clean can be removed. Change-Id: I2c167cba9525fb59189dbb5f2cdcf60631e6c98b --- D modules/scap/manifests/clean.pp M modules/scap/manifests/init.pp 2 files changed, 0 insertions(+), 29 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/33/289333/1 diff --git a/modules/scap/manifests/clean.pp b/modules/scap/manifests/clean.pp deleted file mode 100644 index cfa2431..0000000 --- a/modules/scap/manifests/clean.pp +++ /dev/null @@ -1,26 +0,0 @@ -# == Class scap::clean -# -# This is a class that removes any vestiges of legacy scap from production -# systems that may cause issues. This class can be removed after it is -# run in production. -# -# Scap has a long history, let's make sure we hide that. - -class scap::clean { - $old_binstubs = [ - '/usr/local/bin/mwversionsinuse', - '/usr/local/bin/refreshCdbJsonFiles', - '/usr/local/bin/scap-rebuild-cdbs', - '/usr/local/bin/scap-recompile', - '/usr/local/bin/sync-common', - ] - - file { $old_binstubs: - ensure => absent, - } - - file { '/srv/deployment/scap': - ensure => absent, - force => true, - } -} diff --git a/modules/scap/manifests/init.pp b/modules/scap/manifests/init.pp index 5fc42e5..cdffa51 100644 --- a/modules/scap/manifests/init.pp +++ b/modules/scap/manifests/init.pp @@ -3,9 +3,6 @@ # Common role for scap masters and targets class scap ($deployment_server = 'deployment') { - # Temporarily included to clean legacy code, should be removed once run - include scap::clean - package { 'scap': ensure => '3.2.0-1', } -- To view, visit https://gerrit.wikimedia.org/r/289333 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2c167cba9525fb59189dbb5f2cdcf60631e6c98b Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Thcipriani <tcipri...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits