coren has submitted this change and it was merged.
Change subject: Tools: Manage obsolete files in /usr/local/bin
......................................................................
Tools: Manage obsolete files in /usr/local/bin
/usr/local/bin had some obsolete versions of scripts that since then
have been moved to /usr/bin. To properly manage those, we add
symbolic links pointing to /usr/bin. Also, the requirement of the
jobutils package is moved from toollabs::bastion and
toollabs::webserver to gridengine::submit_host. This fixes bug
Bug: 52258
Change-Id: I28ff4ea1806f0f58e1738cf8194f44ea49085608
---
M modules/gridengine/manifests/submit_host.pp
M modules/toollabs/manifests/bastion.pp
M modules/toollabs/manifests/webserver.pp
3 files changed, 28 insertions(+), 8 deletions(-)
Approvals:
coren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/gridengine/manifests/submit_host.pp
b/modules/gridengine/manifests/submit_host.pp
index e22e028..a441ef6 100644
--- a/modules/gridengine/manifests/submit_host.pp
+++ b/modules/gridengine/manifests/submit_host.pp
@@ -6,7 +6,7 @@
gridmaster => $gridmaster,
}
- package { "gridengine-client":
+ package { [ "gridengine-client", "jobutils" ]:
ensure => latest,
}
@@ -19,6 +19,25 @@
target => "/data/project/.system/accounting",
}
+ # Temporary hack to manage obsolete files in /usr/local/bin.
+ # TODO: Remove when no longer needed.
+ file { "/usr/local/bin/job":
+ ensure => link,
+ target => "/usr/bin/job",
+ }
+ file { "/usr/local/bin/jstart":
+ ensure => link,
+ target => "/usr/bin/jstart",
+ }
+ file { "/usr/local/bin/jstop":
+ ensure => link,
+ target => "/usr/bin/jstop",
+ }
+ file { "/usr/local/bin/jsub":
+ ensure => link,
+ target => "/usr/bin/jsub",
+ }
+
# Not actually possible in the labs
# @@sshkey { $fqdn:
# ensure => present,
diff --git a/modules/toollabs/manifests/bastion.pp
b/modules/toollabs/manifests/bastion.pp
index 9aaf51b..d0f752c 100644
--- a/modules/toollabs/manifests/bastion.pp
+++ b/modules/toollabs/manifests/bastion.pp
@@ -65,10 +65,17 @@
ensure => absent,
}
- package { [ 'jobutils', 'misctools' ]:
+ package { "misctools":
ensure => latest,
}
+ # Temporary hack to manage obsolete files in /usr/local/bin.
+ # TODO: Remove when no longer needed.
+ file { "/usr/local/bin/become":
+ ensure => link,
+ target => "/usr/bin/become"
+ }
+
# TODO: cron setup
}
diff --git a/modules/toollabs/manifests/webserver.pp
b/modules/toollabs/manifests/webserver.pp
index e700a27..6ff3ffa 100644
--- a/modules/toollabs/manifests/webserver.pp
+++ b/modules/toollabs/manifests/webserver.pp
@@ -25,12 +25,6 @@
ensure => present
}
- package { [
- 'jobutils',
- ]:
- ensure => latest
- }
-
file { "$store/submithost-$fqdn":
ensure => file,
owner => 'root',
--
To view, visit https://gerrit.wikimedia.org/r/77234
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I28ff4ea1806f0f58e1738cf8194f44ea49085608
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <[email protected]>
Gerrit-Reviewer: Tim Landscheidt <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
