Tim Landscheidt has uploaded a new change for review. https://gerrit.wikimedia.org/r/77234
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. 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, 17 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/34/77234/1 diff --git a/modules/gridengine/manifests/submit_host.pp b/modules/gridengine/manifests/submit_host.pp index 76e2d80..68fe717 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, } @@ -17,6 +17,14 @@ ensure => present; } + # Temporary hack to manage obsolete files in /usr/local/bin. + # TODO: Remove when no longer needed. + file { [ "/usr/local/bin/job", "/usr/local/bin/jstart", + "/usr/local/bin/jstop", "/usr/local/bin/jsub"]: + ensure => link, + target => regsubst(name, "^/usr/local/bin/", "/usr/bin/") + } + # 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 2e17bb0..c3a037c 100644 --- a/modules/toollabs/manifests/bastion.pp +++ b/modules/toollabs/manifests/bastion.pp @@ -45,10 +45,17 @@ source => "puppet:///modules/toollabs/sql", } - 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: newchange Gerrit-Change-Id: I28ff4ea1806f0f58e1738cf8194f44ea49085608 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits