diff --git a/debian/pvc-daemon-node.install b/debian/pvc-daemon-node.install index 6e35490e..c10f86ab 100644 --- a/debian/pvc-daemon-node.install +++ b/debian/pvc-daemon-node.install @@ -3,5 +3,4 @@ node-daemon/pvcnoded.sample.yaml etc/pvc node-daemon/pvcnoded usr/share/pvc node-daemon/pvcnoded.service lib/systemd/system node-daemon/pvc.target lib/systemd/system -node-daemon/pvc-flush.service lib/systemd/system node-daemon/monitoring usr/share/pvc diff --git a/debian/pvc-daemon-node.postinst b/debian/pvc-daemon-node.postinst index 12a9237c..c889451a 100644 --- a/debian/pvc-daemon-node.postinst +++ b/debian/pvc-daemon-node.postinst @@ -7,11 +7,6 @@ systemctl daemon-reload systemctl enable /lib/systemd/system/pvcnoded.service systemctl enable /lib/systemd/system/pvc.target -# Inform administrator of the autoflush daemon if it is not enabled -if ! systemctl is-active --quiet pvc-flush.service; then - echo "NOTE: The PVC autoflush daemon (pvc-flush.service) is not enabled by default; enable it to perform automatic flush/unflush actions on host shutdown/startup." -fi - # Inform administrator of the service restart/startup not occurring automatically if systemctl is-active --quiet pvcnoded.service; then echo "NOTE: The PVC node daemon (pvcnoded.service) has not been restarted; this is up to the administrator." diff --git a/node-daemon/pvc-flush.service b/node-daemon/pvc-flush.service deleted file mode 100644 index 58fc43f6..00000000 --- a/node-daemon/pvc-flush.service +++ /dev/null @@ -1,20 +0,0 @@ -# Parallel Virtual Cluster autoflush daemon - -[Unit] -Description = Parallel Virtual Cluster autoflush daemon -After = pvcnoded.service pvcapid.service zookeeper.service libvirtd.service ssh.service ceph.target network-online.target -Wants = pvcnoded.service -PartOf = pvc.target - -[Service] -Type = oneshot -RemainAfterExit = true -WorkingDirectory = /usr/share/pvc -TimeoutSec = 30min -ExecStartPre = /bin/sleep 30 -ExecStart = /usr/bin/pvc -c local node unflush --wait -ExecStop = /usr/bin/pvc -c local node flush --wait -ExecStopPost = /bin/sleep 5 - -[Install] -WantedBy = pvc.target