Ori.livneh has submitted this change and it was merged.
Change subject: Remove dangling scap symlinks
......................................................................
Remove dangling scap symlinks
Remove symlinks to scap scripts that were deleted from scap in If4c1580
and I4d1817a.
Change-Id: I15efb3c27858cc67990acf77018998f718f6726b
---
M manifests/misc/deployment.pp
M modules/mediawiki/manifests/sync.pp
2 files changed, 5 insertions(+), 13 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index 57c9a4d..c08d6b1 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -183,14 +183,12 @@
ensure => link,
target => "/srv/scap/bin/restart-twemproxy";
"${scriptpath}/scap-old":
- ensure => link,
- target => "/srv/scap/bin/scap-old";
+ ensure => absent;
"${scriptpath}/scap":
ensure => link,
target => "/srv/scap/bin/scap";
"${scriptpath}/sync-common-all":
- ensure => link,
- target => "/srv/scap/bin/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 c801dc7..5cd888a 100644
--- a/modules/mediawiki/manifests/sync.pp
+++ b/modules/mediawiki/manifests/sync.pp
@@ -19,21 +19,15 @@
file {
"${scriptpath}/find-nearest-rsync":
- ensure => link,
- target => '/srv/scap/bin/find-nearest-rsync',
- require => Git::Clone['mediawiki/tools/scap'];
+ ensure => absent;
"${scriptpath}/mwversionsinuse":
ensure => link,
target => '/srv/scap/bin/mwversionsinuse',
require => Git::Clone['mediawiki/tools/scap'];
"${scriptpath}/scap-1":
- ensure => link,
- target => '/srv/scap/bin/scap-1',
- require => Git::Clone['mediawiki/tools/scap'];
+ ensure => absent;
"${scriptpath}/scap-2":
- ensure => link,
- target => '/srv/scap/bin/scap-2',
- require => Git::Clone['mediawiki/tools/scap'];
+ ensure => absent;
"${scriptpath}/scap-rebuild-cdbs":
ensure => link,
target => '/srv/scap/bin/scap-rebuild-cdbs',
--
To view, visit https://gerrit.wikimedia.org/r/117817
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I15efb3c27858cc67990acf77018998f718f6726b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: 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
