Merge pull request ceph#15585 from dachary/wip-20229-ceph-disk-timeout

ceph-disk: set the default systemd unit timeout to 3h Reviewed-by: Josh Durgin <[email protected]>
amincheloh · Jul 1, 2017 · 70a9907 · 70a9907
2 parents 715968d + a9eb52e
commit 70a9907
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/systemd/[email protected] b/systemd/[email protected]
@@ -6,6 +6,6 @@ Wants=local-fs.target
 [Service]
 Type=oneshot
 KillMode=none
-Environment=CEPH_DISK_TIMEOUT=300
+Environment=CEPH_DISK_TIMEOUT=10000
 ExecStart=/bin/sh -c 'timeout $CEPH_DISK_TIMEOUT flock /var/lock/ceph-disk-$(basename %f) /usr/sbin/ceph-disk --verbose --log-stdout trigger --sync %f'
 TimeoutSec=0