From 9b61f7b29d8652a319777d61d297dd10b776258c Mon Sep 17 00:00:00 2001 From: Wei Quan Date: Wed, 24 Jun 2026 20:41:56 +0200 Subject: [PATCH] Remove nfs_mounter job --- jobs/nfs_mounter/monit | 8 --- jobs/nfs_mounter/spec | 34 ------------- .../templates/handle_nfs_blobstore.sh.erb | 50 ------------------- jobs/nfs_mounter/templates/idmapd.conf.erb | 10 ---- jobs/nfs_mounter/templates/nfs-common | 2 - .../nfs_mounter/templates/nfs_mounter_crontab | 1 - .../nfs_mounter/templates/nfs_mounter_ctl.erb | 46 ----------------- jobs/nfs_mounter/templates/pre-start.sh.erb | 50 ------------------- 8 files changed, 201 deletions(-) delete mode 100644 jobs/nfs_mounter/monit delete mode 100644 jobs/nfs_mounter/spec delete mode 100644 jobs/nfs_mounter/templates/handle_nfs_blobstore.sh.erb delete mode 100644 jobs/nfs_mounter/templates/idmapd.conf.erb delete mode 100644 jobs/nfs_mounter/templates/nfs-common delete mode 100644 jobs/nfs_mounter/templates/nfs_mounter_crontab delete mode 100644 jobs/nfs_mounter/templates/nfs_mounter_ctl.erb delete mode 100644 jobs/nfs_mounter/templates/pre-start.sh.erb diff --git a/jobs/nfs_mounter/monit b/jobs/nfs_mounter/monit deleted file mode 100644 index 903ac47e7b..0000000000 --- a/jobs/nfs_mounter/monit +++ /dev/null @@ -1,8 +0,0 @@ -<% if properties.nfs_server.address %> - -check file nfs_mounter path /etc/cron.d/nfs_mounter_crontab - start program "/var/vcap/jobs/nfs_mounter/bin/nfs_mounter_ctl install" - stop program "/var/vcap/jobs/nfs_mounter/bin/nfs_mounter_ctl unmount" - group vcap - -<% end %> diff --git a/jobs/nfs_mounter/spec b/jobs/nfs_mounter/spec deleted file mode 100644 index e3c78ed17b..0000000000 --- a/jobs/nfs_mounter/spec +++ /dev/null @@ -1,34 +0,0 @@ ---- -name: nfs_mounter - -description: "The NFS Mounter sets up an NFS mount at a specific location. It can be used with the Cloud Controller to save assets to the NFS Server." -# "The NFS Mounter does not use BPM. Having this job use bpm would be very difficult and provide little value." - -templates: - handle_nfs_blobstore.sh.erb: bin/handle_nfs_blobstore.sh - idmapd.conf.erb: config/idmapd.conf - nfs-common: config/nfs-common - nfs_mounter_ctl.erb: bin/nfs_mounter_ctl - nfs_mounter_crontab: bin/nfs_mounter_crontab - pre-start.sh.erb: bin/pre-start - -packages: - - nfs-debs - - capi_utils - -properties: - nfs_server.address: - description: "NFS server for droplets and apps (not used in an AWS deploy, use s3 instead)" - nfs_server.share: - description: "Path to share from the remote NFS server (not used in an AWS deploy, use s3 instead)" - nfs_server.nfsv4: - description: "bool to use NFS4 (not used in an AWS deploy, use s3 instead)" - nfs_server.idmapd_domain: - description: "Domain name for NFS idmapd" - default: "localdomain" - nfs_server.pipefs_directory: - description: "Pipefs directory for NFS idmapd" - default: "/var/lib/nfs/rpc_pipefs" - nfs_server.share_path: - description: "Location to mount the nfs share" - default: "/var/vcap/data/nfs" diff --git a/jobs/nfs_mounter/templates/handle_nfs_blobstore.sh.erb b/jobs/nfs_mounter/templates/handle_nfs_blobstore.sh.erb deleted file mode 100644 index 75c2a2cde9..0000000000 --- a/jobs/nfs_mounter/templates/handle_nfs_blobstore.sh.erb +++ /dev/null @@ -1,50 +0,0 @@ -function nfs_mounted() { - mount | grep -q "on ${NFS_SHARE} type nfs" -} - -mount_nfs() { - if nfs_mounted; then - exit 0 - fi - - mkdir -p "${NFS_SHARE}" - - cp -f /etc/default/nfs-common /etc/default/nfs-common.orig - cp -f "${NFS_JOB_DIR}/config/nfs-common" /etc/default/nfs-common - - cp -f "${NFS_JOB_DIR}/config/idmapd.conf" /etc/idmapd.conf - service idmapd restart - - unmount_nfs - - echo "Mounting NFS..." - <% if properties.nfs_server.nfsv4 %> - mount --verbose -o intr,lookupcache=positive,soft -t nfs4 <%= properties.nfs_server.address %>:<%= properties.nfs_server.share || "/" %> $NFS_SHARE - <% else %> - mount --verbose -o intr,lookupcache=positive,soft -t nfs <%= properties.nfs_server.address %>:<%= properties.nfs_server.share || "/var/vcap/store" %> $NFS_SHARE - <% end %> - if [ $? != 0 ]; then - echo "Cannot mount NFS, exiting..." - exit 1 - fi - - chpst -u vcap:vcap mkdir -p "${NFS_SHARE}/shared" - chpst -u vcap:vcap touch "${NFS_SHARE}/shared/.nfs_test" - if [ $? != 0 ]; then - echo "Failed to start: cannot write to NFS" - exit 1 - fi - echo "NFS mounted" -} - -unmount_nfs() { - if grep -qs "${NFS_SHARE}" /proc/mounts; then - echo "Found NFS mount, unmounting..." - umount "${NFS_SHARE}" - if [ $? -ne 0 ]; then - echo "Failed to unmount NFS, exiting..." - exit 1 - fi - fi - echo "NFS unmounted" -} diff --git a/jobs/nfs_mounter/templates/idmapd.conf.erb b/jobs/nfs_mounter/templates/idmapd.conf.erb deleted file mode 100644 index dc5c5392bd..0000000000 --- a/jobs/nfs_mounter/templates/idmapd.conf.erb +++ /dev/null @@ -1,10 +0,0 @@ -[General] - -Verbosity = 0 -Domain = <%= p("nfs_server.idmapd_domain") %> -Pipefs-Directory = <%= p("nfs_server.pipefs_directory") %> - -[Mapping] - -Nobody-User = nobody -Nobody-Group = nogroup diff --git a/jobs/nfs_mounter/templates/nfs-common b/jobs/nfs_mounter/templates/nfs-common deleted file mode 100644 index 40f3526a2a..0000000000 --- a/jobs/nfs_mounter/templates/nfs-common +++ /dev/null @@ -1,2 +0,0 @@ -NEED_IDMAPD=yes -NEED_GSSD=no diff --git a/jobs/nfs_mounter/templates/nfs_mounter_crontab b/jobs/nfs_mounter/templates/nfs_mounter_crontab deleted file mode 100644 index d04950ba3a..0000000000 --- a/jobs/nfs_mounter/templates/nfs_mounter_crontab +++ /dev/null @@ -1 +0,0 @@ -* * * * * root /var/vcap/jobs/nfs_mounter/bin/nfs_mounter_ctl mount diff --git a/jobs/nfs_mounter/templates/nfs_mounter_ctl.erb b/jobs/nfs_mounter/templates/nfs_mounter_ctl.erb deleted file mode 100644 index 9d3e399ead..0000000000 --- a/jobs/nfs_mounter/templates/nfs_mounter_ctl.erb +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -PATH=/usr/lib/sysstat:/usr/sbin:/usr/sbin:/usr/bin:/sbin:/bin - -export NFS_JOB_DIR=/var/vcap/jobs/nfs_mounter - -LOG_DIR=/var/vcap/sys/log/nfs_mounter - -export CONFIG_DIR="${NFS_JOB_DIR}/config" -export NFS_SHARE=<%= p('nfs_server.share_path') %> - -source /var/vcap/packages/capi_utils/output_utils.sh -source "${NFS_JOB_DIR}/bin/handle_nfs_blobstore.sh" - -write_output_to_file_with_datetime "${LOG_DIR}" "$(basename "$0")" - -function mounter_running() { - [[ $(pgrep -c -f nfs_mounter_ctl) -gt 16 ]] -} - -case $1 in - - install) - cp /var/vcap/jobs/nfs_mounter/bin/nfs_mounter_crontab /etc/cron.d/ - chmod 0644 /etc/cron.d/nfs_mounter_crontab - mount_nfs - ;; - - mount) - if mounter_running; then - exit 0 - fi - - mount_nfs - ;; - - unmount) - rm /etc/cron.d/nfs_mounter_crontab - unmount_nfs - ;; - - *) - echo "Usage: nfs_mounter_ctl {install|mount|unmount}" - ;; - -esac diff --git a/jobs/nfs_mounter/templates/pre-start.sh.erb b/jobs/nfs_mounter/templates/pre-start.sh.erb deleted file mode 100644 index 71e15ed640..0000000000 --- a/jobs/nfs_mounter/templates/pre-start.sh.erb +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env bash - -LOG_DIR=/var/vcap/sys/log/nfs_mounter - -mkdir -p "${LOG_DIR}" -chown vcap:vcap "${LOG_DIR}" - -install_if_missing () -{ - set +e - dpkg -s $1 - not_installed=$(echo $?) - set -e - if [ not_installed ]; then - dpkg --force-confdef -i $2 - fi -} - -codename=$(lsb_release -cs) -if [ "$codename" == "xenial" ]; then - echo "Installing NFS packages" - ( - flock -x 200 - install_if_missing rpcbind /var/vcap/packages/nfs-debs/rpcbind_0.2.3-0.2_amd64.deb - install_if_missing keyutils /var/vcap/packages/nfs-debs/keyutils_1.5.9-8ubuntu1_amd64.deb - install_if_missing libevent-2.0-5 /var/vcap/packages/nfs-debs/libevent-2.0-5_2.0.21-stable-2ubuntu0.16.04.1_amd64.deb - install_if_missing libnfsidmap2 /var/vcap/packages/nfs-debs/libnfsidmap2_0.25-5_amd64.deb - install_if_missing nfs-common /var/vcap/packages/nfs-debs/nfs-common_1%3a1.2.8-9ubuntu12.1_amd64.deb - ) 200>/var/vcap/data/dpkg.lock -elif [ "$codename" == "bionic" ]; then - echo "Installing NFS packages" - ( - flock -x 200 - install_if_missing rpcbind /var/vcap/packages/nfs-debs/rpcbind_0.2.3-0.6ubuntu0.18.04.4_amd64.deb - install_if_missing keyutils /var/vcap/packages/nfs-debs/keyutils_1.5.9-9.2ubuntu2_amd64.deb - install_if_missing libevent-2.1-6 /var/vcap/packages/nfs-debs/libevent-2.1-6_2.1.8-stable-4build1_amd64.deb - install_if_missing libnfsidmap2 /var/vcap/packages/nfs-debs/libnfsidmap2_0.25-5.1_amd64.deb - install_if_missing nfs-common /var/vcap/packages/nfs-debs/nfs-common_1.3.4-2.1ubuntu5.3_amd64.deb - ) 200>/var/vcap/data/dpkg.lock -elif [ "$codename" == "jammy" ]; then - echo "Installing NFS packages" - ( - flock -x 200 - install_if_missing rpcbind /var/vcap/packages/nfs-debs/rpcbind_1.2.6-2build1_amd64.deb - install_if_missing keyutils /var/vcap/packages/nfs-debs/keyutils_1.6.1-2ubuntu3_amd64.deb - install_if_missing libevent-core-2.1-7 /var/vcap/packages/nfs-debs/libevent-core-2.1-7_2.1.12-stable-1build3_amd64.deb - install_if_missing libnfsidmap2 /var/vcap/packages/nfs-debs/libnfsidmap1_2.6.1-1ubuntu1_amd64.deb - install_if_missing nfs-common /var/vcap/packages/nfs-debs/nfs-common_2.6.1-1ubuntu1_amd64.deb - ) 200>/var/vcap/data/dpkg.lock -fi