Skip to content

Commit 4663f6f

Browse files
committed
Merge pull request #2302 from mboersma/fix-store-volume-cruft
fix(deisctl/units): remove extra commands in store-volume Start-Pre
2 parents 3c307ea + e021b7d commit 4663f6f

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

deisctl/units/deis-store-volume.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Description=deis-store-volume
55
EnvironmentFile=/etc/environment
66
ExecStartPre=/usr/bin/mkdir -p /var/lib/deis/store
77
ExecStartPre=/bin/sh -c "echo waiting for store-monitor... && until etcdctl get /deis/store/monSetupComplete >/dev/null 2>&1; do sleep 2; done"
8-
ExecStartPre=/bin/bash -c "HOSTS=`etcdctl ls /deis/store/hosts | cut -d/ -f5 | etcdctl ls /deis/store/hosts | cut -d/ -f5 | awk '{if(NR == 1) {printf $0} else {printf \",\"$0}}'` && mount -t ceph $HOSTS:/ /var/lib/deis/store -o name=admin,secret=`etcdctl get /deis/store/adminKeyring | grep 'key =' | cut -d' ' -f3`"
8+
ExecStartPre=/bin/bash -c "HOSTS=`etcdctl ls /deis/store/hosts | cut -d/ -f5 | awk '{if(NR == 1) {printf $0} else {printf \",\"$0}}'` && mount -t ceph $HOSTS:/ /var/lib/deis/store -o name=admin,secret=`etcdctl get /deis/store/adminKeyring | grep 'key =' | cut -d' ' -f3`"
99
ExecStart=/usr/bin/tail -f /dev/null
1010
ExecStartPost=/bin/sh -c "test -d /var/lib/deis/store/logs || mkdir -p /var/lib/deis/store/logs"
1111
ExecStopPost=-/usr/bin/umount /var/lib/deis/store

0 commit comments

Comments
 (0)