Ori.livneh has submitted this change and it was merged.
Change subject: Remove removed scap symlinks
......................................................................
Remove removed scap symlinks
Remove mention of the deleted scripts entirely from the manifests. This
should not be merged until I15efb3c has been merged and applied on all
effected hosts.
Change-Id: I9f05dc92e363070c7f9b1dc9d74905d7ce0c47c2
---
M manifests/misc/deployment.pp
M modules/mediawiki/manifests/sync.pp
2 files changed, 0 insertions(+), 10 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index c08d6b1..0d3e20b 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -182,13 +182,9 @@
"${scriptpath}/restart-twemproxy":
ensure => link,
target => "/srv/scap/bin/restart-twemproxy";
- "${scriptpath}/scap-old":
- ensure => absent;
"${scriptpath}/scap":
ensure => link,
target => "/srv/scap/bin/scap";
- "${scriptpath}/sync-common-all":
- ensure => absent;
"${scriptpath}/sync-common-file":
ensure => link,
target => "/srv/scap/bin/sync-common-file";
diff --git a/modules/mediawiki/manifests/sync.pp
b/modules/mediawiki/manifests/sync.pp
index 5cd888a..803d449 100644
--- a/modules/mediawiki/manifests/sync.pp
+++ b/modules/mediawiki/manifests/sync.pp
@@ -18,16 +18,10 @@
$scriptpath = "/usr/local/bin"
file {
- "${scriptpath}/find-nearest-rsync":
- ensure => absent;
"${scriptpath}/mwversionsinuse":
ensure => link,
target => '/srv/scap/bin/mwversionsinuse',
require => Git::Clone['mediawiki/tools/scap'];
- "${scriptpath}/scap-1":
- ensure => absent;
- "${scriptpath}/scap-2":
- ensure => absent;
"${scriptpath}/scap-rebuild-cdbs":
ensure => link,
target => '/srv/scap/bin/scap-rebuild-cdbs',
--
To view, visit https://gerrit.wikimedia.org/r/117818
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9f05dc92e363070c7f9b1dc9d74905d7ce0c47c2
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
