From 2dc82e1e071967d9ecb6219d795f2b3bd7ad2218 Mon Sep 17 00:00:00 2001 From: Jason Bacon Date: Thu, 27 Aug 2020 12:05:14 +0000 Subject: [PATCH] cluster-admin: Update to work with last commit --- cluster-admin/DESCR | 3 + cluster-admin/Makefile | 34 +++++------ cluster-admin/PLIST | 118 +++++++++++++++++++++++++++++++++++++ cluster-admin/PLIST.Linux | 105 --------------------------------- cluster-admin/PLIST.NetBSD | 0 cluster-admin/distinfo | 8 +-- 6 files changed, 139 insertions(+), 129 deletions(-) delete mode 100644 cluster-admin/PLIST.Linux delete mode 100644 cluster-admin/PLIST.NetBSD diff --git a/cluster-admin/DESCR b/cluster-admin/DESCR index e69de29bb2..4b45b7edac 100644 --- a/cluster-admin/DESCR +++ b/cluster-admin/DESCR @@ -0,0 +1,3 @@ +Cluster-admin is a suite of tools for building and managing FreeBSD clusters. +It automates the processing of creating a head node and compute nodes, and +managing configuration and software after installation. diff --git a/cluster-admin/Makefile b/cluster-admin/Makefile index c1f55fde5a..4b09e95260 100644 --- a/cluster-admin/Makefile +++ b/cluster-admin/Makefile @@ -1,37 +1,31 @@ # $NetBSD$ -DISTNAME= cluster-admin-0.3 +DISTNAME= cluster-admin-0.4 CATEGORIES= sysutils -MASTER_SITES= http://acadix.biz/Ports/distfiles/ +MASTER_SITES= http://acadix.biz/Ports/distfiles/ \ + http://outpaddling.mooo.com/~bacon/Acadix/Ports/distfiles/ EXTRACT_SUFX= .tar.xz -MAINTAINER= INSERT_YOUR_MAIL_ADDRESS_HERE +MAINTAINER= bacon@NetBSD.org HOMEPAGE= http://acadix.biz/Ports/distfiles/ -COMMENT= TODO: Short description of the package -#LICENSE= # TODO: (see mk/license.mk) +COMMENT= HPC cluster admin tools +LICENSE= 2-clause-bsd -USE_LANGUAGES= # none - -NO_BUILD= yes +# Add py-hostlist dep DATADIR= ${PREFIX}/share/cluster-admin -SUBST_CLASSES+= datadir -SUBST_STAGE.datadir= post-patch -SUBST_FILES.datadir= ${WRKSRC}/CentOS/Sys-scripts/ganglia-web-setup \ - ${WRKSRC}/Common/Sys-scripts/slurm-update-idle-nodes -SUBST_SED.datadir= -e 's|%%DATADIR%%|${PREFIX}/share/cluster-admin|g' +SUBST_CLASSES+= sbin +SUBST_STAGE.sbin= pre-configure +SUBST_FILES.sbin+= Common/Src/cluster-passwd.c +SUBST_SED.sbin= -e 's|/usr/local/sbin|${PREFIX}/sbin|g' -SUBST_CLASSES+= prefix -SUBST_STAGE.prefix= post-patch -SUBST_FILES.prefix= ${WRKSRC}/Common/User-scripts/slurm-shell -SUBST_SED.prefix= -e 's|/usr/local|${PREFIX}|g' +DEPENDS+= auto-admin>=0.4.9:../../uwm-pkgsrc-wip/auto-admin -DEPENDS+= auto-admin>=0.3.8:../../jb-wip/auto-admin +USE_TOOLS+= bash .include "../../mk/bsd.prefs.mk" -MAKE_ENV+= PREFIX=${PREFIX} DATADIR=${DATADIR} +MAKE_ENV+= PREFIX=${PREFIX} DATADIR=${DATADIR} -.include "../../wip/py-hostlist/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cluster-admin/PLIST b/cluster-admin/PLIST index 48d96a5493..66efd5055c 100644 --- a/cluster-admin/PLIST +++ b/cluster-admin/PLIST @@ -1 +1,119 @@ @comment $NetBSD$ +bin/cluster-all-nodes +bin/cluster-backup-nodes +bin/cluster-compute-nodes +bin/cluster-down-nodes +bin/cluster-file-servers +bin/cluster-passwd +bin/cluster-pfs-nodes +bin/cluster-pw-check +bin/cluster-raid-nodes +bin/cluster-vis-nodes +bin/cluster-zfs-nodes +bin/condor-build-R-packages +bin/condor-cpus +bin/condor-list-packages +bin/psnode +bin/slurm-cluster-load +bin/slurm-find-strays +bin/slurm-gui-job +bin/slurm-job-hist +bin/slurm-job-stats +bin/slurm-job-status +bin/slurm-load-summary +bin/slurm-memory-use +bin/slurm-node-info +bin/slurm-pending-jobs +bin/slurm-shell +bin/slurm-user-cores +bin/topjob +bin/topnode +libexec/add-gecos.awk +sbin/cluster-add-to-group +sbin/cluster-adduser +sbin/cluster-admin +sbin/cluster-archive-user-dir +sbin/cluster-change-group-gid +sbin/cluster-change-nfsd-count +sbin/cluster-change-primary-group +sbin/cluster-change-uid +sbin/cluster-check-cron-updates +sbin/cluster-create-pw-age +sbin/cluster-diagnostics +sbin/cluster-dist-file +sbin/cluster-enable-autologout +sbin/cluster-firewalld-config +sbin/cluster-ganglia-restart +sbin/cluster-get-sync-file +sbin/cluster-head-check +sbin/cluster-highest-uid +sbin/cluster-idrac-config +sbin/cluster-init-node +sbin/cluster-krb-auth-setup +sbin/cluster-lock-local-pw +sbin/cluster-lock-user +sbin/cluster-lowest-uid +sbin/cluster-munge-enable +sbin/cluster-node-admin +sbin/cluster-node-type +sbin/cluster-passwd-expiration +sbin/cluster-passwd-user-expiration +sbin/cluster-pkgsrc-admin +sbin/cluster-recreate-user +sbin/cluster-remove-from-group +sbin/cluster-remove-from-known-hosts +sbin/cluster-remove-user +sbin/cluster-restore-user +sbin/cluster-run +sbin/cluster-set-compute-memory-limits +sbin/cluster-setup +sbin/cluster-shutdown +sbin/cluster-slurm-enable +sbin/cluster-ssh-keygen +sbin/cluster-stay-down +sbin/cluster-sync-backup-nodes +sbin/cluster-sync-files +sbin/cluster-sync-node +sbin/cluster-sync-packages +sbin/cluster-sync-pw +sbin/cluster-sync-sysfiles +sbin/cluster-sync-user +sbin/cluster-transfer-pw +sbin/cluster-unlock-local-pw +sbin/cluster-unlock-user +sbin/cluster-update-backup-nodes +sbin/cluster-update-file-servers +sbin/cluster-update-vis-nodes +sbin/cluster-user-admin +sbin/cluster-user-cleanup +sbin/cluster-useradd +sbin/cluster-users +sbin/condor-build-R-packages +sbin/condor-list-packages +sbin/ganglia-web-setup +sbin/node-sync-all-users +sbin/node-sync-groups +sbin/node-sync-users +sbin/slurm-admin +sbin/slurm-cron-updates +sbin/slurm-drain-all +sbin/slurm-restart +sbin/slurm-resume-nodes +sbin/slurm-resume-updated-nodes +sbin/slurm-shutdown-idle-nodes +sbin/slurm-sync-backup +sbin/slurm-sync-config +sbin/slurm-update-idle-nodes +sbin/slurm-usage-report +sbin/spcm-banner +sbin/ssh-keygen-for-user +sbin/update-cluster-admin-wip +share/cluster-admin/WWW/centos-power.jpg +share/cluster-admin/WWW/global_styles.css +share/cluster-admin/WWW/gmetad.conf.template +share/cluster-admin/WWW/gmond.conf.template +share/cluster-admin/WWW/index.php +share/cluster-admin/WWW/pkgsrc.jpg +share/cluster-admin/profile.d/zzz-cluster.csh +share/cluster-admin/profile.d/zzz-cluster.sh +share/cluster-admin/sys-update.sbatch diff --git a/cluster-admin/PLIST.Linux b/cluster-admin/PLIST.Linux deleted file mode 100644 index 5139242090..0000000000 --- a/cluster-admin/PLIST.Linux +++ /dev/null @@ -1,105 +0,0 @@ -@comment $NetBSD$ -bin/cluster-all-nodes -bin/cluster-backup-login-nodes -bin/cluster-compute-nodes -bin/cluster-down-nodes -bin/cluster-io-nodes -bin/cluster-load -bin/cluster-vis-nodes -bin/condor-build-R-packages -bin/condor-cpus -bin/condor-list-packages -bin/pending-jobs -bin/ppgen -bin/slurm-cluster-load -bin/slurm-job-hist -bin/slurm-job-stats -bin/slurm-job-status -bin/slurm-load-summary -bin/slurm-pending-jobs -bin/slurm-shell -bin/slurm-user-cores -bin/topnode -libexec/add-gecos.awk -sbin/cluster-add-to-group -sbin/cluster-adduser -sbin/cluster-admin -sbin/cluster-backup-sysfiles -sbin/cluster-diagnostics -sbin/cluster-disable-iptables -sbin/cluster-dist-file -sbin/cluster-ganglia-restart -sbin/cluster-get-sync-file -sbin/cluster-groupadd -sbin/cluster-init-all -sbin/cluster-init-node -sbin/cluster-install-rpms -sbin/cluster-iptables -sbin/cluster-lowest-uid -sbin/cluster-munge-enable -sbin/cluster-net-mon -sbin/cluster-node-admin -sbin/cluster-passwd-expiration -sbin/cluster-pkgsrc-admin -sbin/cluster-remove-from-known-hosts -sbin/cluster-restore-pw -sbin/cluster-restore-user -sbin/cluster-rmuser -sbin/cluster-run -sbin/cluster-set-compute-memory-limits -sbin/cluster-set-idmapd-domain -sbin/cluster-setup -sbin/cluster-shutdown -sbin/cluster-slurm-enable -sbin/cluster-sync-all-groups -sbin/cluster-sync-all-pws -sbin/cluster-sync-backup-login-nodes -sbin/cluster-sync-data-nodes -sbin/cluster-sync-files -sbin/cluster-sync-groups -sbin/cluster-sync-node -sbin/cluster-sync-pkgsrc -sbin/cluster-sync-pw -sbin/cluster-sync-sysfiles -sbin/cluster-sync-user -sbin/cluster-sync-yum-packages -sbin/cluster-update-backup-nodes -sbin/cluster-update-io-nodes -sbin/cluster-user-admin -sbin/cluster-useradd -sbin/cluster-users -sbin/compute-node-yum-packages -sbin/enable-icmp-redirects -sbin/enable-x11-forward -sbin/fix-keys -sbin/fix-slurm-log -sbin/ganglia-web-setup -sbin/head-mount-shares -sbin/iptables-config -sbin/munge-setup -sbin/node-sync-all-users -sbin/node-sync-groups -sbin/node-sync-user -sbin/remount-all-nfs -sbin/remount-nfs -sbin/slurm-admin -sbin/slurm-find-strays -sbin/slurm-restart -sbin/slurm-resume-jobs -sbin/slurm-resume-nodes -sbin/slurm-resume-updated-nodes -sbin/slurm-spool-setup -sbin/slurm-suspend-jobs -sbin/slurm-sync-backup-login -sbin/slurm-sync-config -sbin/slurm-update-idle-nodes -sbin/slurm-usage-report -sbin/ssh-keygen-for-user -sbin/ssh-keygen.csh -sbin/ssh-keygen.sh -sbin/update-idle-nodes -sbin/update-yum-pkgs -share/cluster-admin/WWW/centos-power.jpg -share/cluster-admin/WWW/global_styles.css -share/cluster-admin/WWW/index.php -share/cluster-admin/sys-update.sbatch diff --git a/cluster-admin/PLIST.NetBSD b/cluster-admin/PLIST.NetBSD deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/cluster-admin/distinfo b/cluster-admin/distinfo index a082f0bd5d..17f547e7af 100644 --- a/cluster-admin/distinfo +++ b/cluster-admin/distinfo @@ -1,6 +1,6 @@ $NetBSD$ -SHA1 (cluster-admin-0.3.tar.xz) = db39cf62bd618865fe59242b47e23eb2af94879b -RMD160 (cluster-admin-0.3.tar.xz) = 9c6ab5f222f3034194aee8263d99dc08c2c08a63 -SHA512 (cluster-admin-0.3.tar.xz) = a0e20bf55b74c29c2af0672e4590891f573aae5688bb8ecae34da0b466ac5065f96b97ea4cf4026f1173d158bf94419cb8d36c599c38c3f4d3308b7f7756b674 -Size (cluster-admin-0.3.tar.xz) = 91728 bytes +SHA1 (cluster-admin-0.4.tar.xz) = d77e46128dd4cf074f4c139f87f222a35336425d +RMD160 (cluster-admin-0.4.tar.xz) = 438266ecca81c2bad64bf0095145b01819196ab2 +SHA512 (cluster-admin-0.4.tar.xz) = 1eb25336b56eb2b685404351d21b823202146b20ce7f0aef618fbcbfa6e8edc7075629a7d3badc88537e9cecdaada97f37864c3df58f0440f1781484a07ae8f4 +Size (cluster-admin-0.4.tar.xz) = 115368 bytes