Make a new systemd target.

This will ensure all storages are up before pveproxy is running.

diff --git a/bin/init.d/Makefile b/bin/init.d/Makefile
index 475f01df4fc393175e7676cbf8d4c67dc08d10ae..f984fe131a39cb66f9f12a4ca62e24405a9d34d4 100644 (file)
--- a/bin/init.d/Makefile
+++ b/bin/init.d/Makefile
@@ -17,7 +17,8 @@ SERVICES=                     \
        pve-manager.service     \
        pvedaemon.service       \
        pveproxy.service        \
-       spiceproxy.service
+       spiceproxy.service      \
+       pve-storage.target
 
 .PHONY: install 
 install: ${SCRIPTS}

diff --git a/bin/init.d/pve-storage.target b/bin/init.d/pve-storage.target
new file mode 100644 (file)
index 0000000..96afc11
--- /dev/null
+++ b/bin/init.d/pve-storage.target
@@ -0,0 +1,11 @@
+[Unit]
+Description=PVE Storage Target
+Wants=remote-fs.target
+After=remote-fs.target
+After=ceph.service
+After=ceph-mon.target
+After=ceph-osd.target
+After=ceph-mds.target
+After=ceph-mgr.target
+After=sheepdog.service
+After=glusterd.service

diff --git a/bin/init.d/pveproxy.service b/bin/init.d/pveproxy.service
index 25b6d3b2cd00a4b2d3fd36b7dce76f2bd9fd14cc..9c3c832a32aa04d35b89f809afc62953a712b225 100644 (file)
--- a/bin/init.d/pveproxy.service
+++ b/bin/init.d/pveproxy.service
@@ -4,14 +4,11 @@ ConditionPathExists=/usr/bin/pveproxy
 Wants=pve-cluster.service
 Wants=pvedaemon.service
 Wants=ssh.service
-Wants=remote-fs.target
+Wants=pve-storage.target
+After=pve-storage.target
 After=pve-cluster.service
 After=pvedaemon.service
 After=ssh.service
-After=remote-fs.target
-After=ceph.service
-After=sheepdog.service
-After=glusterd.service
 
 [Service]
 ExecStart=/usr/bin/pveproxy start